HHH-16191 Fix issues uncovered by recent not-found fetchin changes

Author: beikov

hibernate-core/src/main/java/org/hibernate/boot/query/HbmResultSetMappingDescriptor.java

@@ -670,7 +670,7 @@ public FetchMemento resolve(ResultSetMappingResolutionContext resolutionContext)
 							)
 					);
 				}
-				fetchable = (Fetchable) ( (FetchableContainer) fetchable ).findSubPart( propertyPathParts[i], null );
+				fetchable = (Fetchable) ( (FetchableContainer) fetchable.getPartMappingType() ).findSubPart( propertyPathParts[i], null );
 				navigablePath = navigablePath.append( fetchable.getFetchableName() );
 			}
 

hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java

@@ -1829,7 +1829,7 @@ else if ( fetchable instanceof Association ) {
 		return fetches.build();
 	}
 
-	protected boolean isSelectable(FetchParent fetchParent, Fetchable fetchable) {
+	public boolean isSelectable(FetchParent fetchParent, Fetchable fetchable) {
 		if ( fetchParent instanceof EmbeddableResultGraphNode ) {
 			return true;
 		}
@@ -4159,6 +4159,11 @@ public CascadeStyle[] getPropertyCascadeStyles() {
 		return entityMetamodel.getCascadeStyles();
 	}
 
+	@Override
+	public boolean isPropertySelectable(int propertyNumber) {
+		return propertySelectable[propertyNumber];
+	}
+
 	@Override
 	public final Class<?> getMappedClass() {
 		return this.getMappedJavaType().getJavaTypeClass();

hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPersister.java

@@ -674,6 +674,10 @@ void update(
 	 */
 	CascadeStyle[] getPropertyCascadeStyles();
 
+	default boolean isPropertySelectable(int propertyNumber) {
+		return true;
+	}
+
 	/**
 	 * Get the identifier type
 	 */

hibernate-core/src/main/java/org/hibernate/query/results/DomainResultCreationStateImpl.java

@@ -29,6 +29,7 @@
 import org.hibernate.metamodel.mapping.NonAggregatedIdentifierMapping;
 import org.hibernate.metamodel.mapping.internal.BasicValuedCollectionPart;
 import org.hibernate.metamodel.mapping.internal.SingleAttributeIdentifierMapping;
+import org.hibernate.persister.entity.AbstractEntityPersister;
 import org.hibernate.spi.EntityIdentifierNavigablePath;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.query.results.dynamic.DynamicFetchBuilderLegacy;
@@ -428,6 +429,11 @@ public ImmutableFetchList visitFetches(FetchParent fetchParent) {
 
 	private Consumer<Fetchable> createFetchableConsumer(FetchParent fetchParent, ImmutableFetchList.Builder fetches) {
 		return fetchable -> {
+			final FetchableContainer parentMappingType = fetchParent.getReferencedMappingContainer();
+			if ( parentMappingType instanceof AbstractEntityPersister
+					&& !( ( (AbstractEntityPersister) parentMappingType ).isSelectable( fetchParent, fetchable ) ) ) {
+				return;
+			}
 			final String fetchableName = fetchable.getFetchableName();
 			Map.Entry<String, NavigablePath> currentEntry;
 			if ( relativePathStack.isEmpty() ) {

hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderEntityStandard.java

@@ -187,7 +187,7 @@ private <T> T buildResultOrFetch(
 		final NavigablePath elementNavigablePath;
 		if ( fetchable instanceof PluralAttributeMapping ) {
 			collectionTableGroup = fromClauseAccess.getTableGroup( navigablePath );
-			elementNavigablePath = navigablePath.append( fetchable.getPartName() );
+			elementNavigablePath = navigablePath.append( CollectionPart.Nature.ELEMENT.getName() );
 		}
 		else {
 			collectionTableGroup = null;

hibernate-core/src/main/java/org/hibernate/query/sql/internal/ResultSetMappingProcessor.java

@@ -323,7 +323,12 @@ private DynamicResultBuilderEntityStandard createSuffixedResultBuilder(
 			resultBuilderEntity.addProperty( loadable.getIdentifierPropertyName(), identifierAliases );
 		}
 
-		for ( String propertyName : loadable.getPropertyNames() ) {
+		final String[] propertyNames = loadable.getPropertyNames();
+		for ( int i = 0; i < propertyNames.length; i++ ) {
+			if ( !loadable.isPropertySelectable( i ) ) {
+				continue;
+			}
+			final String propertyName = propertyNames[i];
 			final String[] columnAliases = loadable.getSubclassPropertyColumnAliases( propertyName, suffix );
 			final Type propertyType = loadable.getPropertyType( propertyName );
 			addFetchBuilder(