Fix issue with SimpleForeignKeyDescriptor DomainResult creation

hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ForeignKeyDescriptor.java

@@ -25,7 +25,15 @@ public interface ForeignKeyDescriptor extends VirtualModelPart {
 
 	ForeignKeyDirection getDirection();
 
-	DomainResult createDomainResult(NavigablePath collectionPath, TableGroup tableGroup, DomainResultCreationState creationState);
+	DomainResult createCollectionFecthDomainResult(
+			NavigablePath collectionPath,
+			TableGroup tableGroup,
+			DomainResultCreationState creationState);
+
+	DomainResult createDomainResult(
+			NavigablePath collectionPath,
+			TableGroup tableGroup,
+			DomainResultCreationState creationState);
 
 	Predicate generateJoinPredicate(
 			TableGroup lhs,

hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleForeignKeyDescriptor.java

@@ -87,6 +87,46 @@ public ForeignKeyDirection getDirection() {
 		return fKeyDirection;
 	}
 
+	@Override
+	public DomainResult createCollectionFecthDomainResult(
+			NavigablePath collectionPath,
+			TableGroup tableGroup,
+			DomainResultCreationState creationState) {
+		if ( targetColumnContainingTable.equals( keyColumnContainingTable ) ) {
+			final SqlAstCreationState sqlAstCreationState = creationState.getSqlAstCreationState();
+			final SqlExpressionResolver sqlExpressionResolver = sqlAstCreationState.getSqlExpressionResolver();
+			final TableReference tableReference = tableGroup.resolveTableReference( keyColumnContainingTable );
+			final String identificationVariable = tableReference.getIdentificationVariable();
+			final SqlSelection sqlSelection = sqlExpressionResolver.resolveSqlSelection(
+					sqlExpressionResolver.resolveSqlExpression(
+							SqlExpressionResolver.createColumnReferenceKey(
+									tableReference,
+									targetColumnExpression
+							),
+							s -> {
+								return new ColumnReference(
+										identificationVariable,
+										targetColumnExpression,
+										jdbcMapping,
+										creationState.getSqlAstCreationState().getCreationContext().getSessionFactory()
+								);
+							}
+					),
+					jdbcMapping.getJavaTypeDescriptor(),
+					sqlAstCreationState.getCreationContext().getDomainModel().getTypeConfiguration()
+			);
+
+			//noinspection unchecked
+			return new BasicResult(
+					sqlSelection.getValuesArrayPosition(),
+					null,
+					jdbcMapping.getJavaTypeDescriptor()
+			);
+		}else {
+			return createDomainResult( collectionPath, tableGroup, creationState );
+		}
+	}
+
 	@Override
 	public DomainResult createDomainResult(
 			NavigablePath collectionPath,

hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/AbstractCollectionInitializer.java

@@ -177,6 +177,11 @@ else if ( keyCollectionValue != null ) {
 						LoggingHelper.toLoggableString( getNavigablePath(), this.collectionKey.getKey() )
 				);
 			}
+		}else {
+			this.collectionKey = new CollectionKey(
+					collectionAttributeMapping.getCollectionDescriptor(),
+					parentAccess.getParentKey()
+			);
 		}
 	}
 

hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/EagerCollectionFetch.java

@@ -61,13 +61,13 @@ public EagerCollectionFetch(
 		final ForeignKeyDescriptor keyDescriptor = fetchedAttribute.getKeyDescriptor();
 		if ( parentTableGroup != null ) {
 			// join fetch
-			keyContainerResult = keyDescriptor.createDomainResult( fetchedPath, parentTableGroup, creationState );
+			keyContainerResult = keyDescriptor.createCollectionFecthDomainResult( fetchedPath, parentTableGroup, creationState );
 			keyCollectionResult = keyDescriptor.createDomainResult( fetchedPath, collectionTableGroup, creationState );
 		}
 		else {
 			// select fetch
 			// todo (6.0) : we could potentially leverage batch fetching for performance
-			keyContainerResult = keyDescriptor.createDomainResult( fetchedPath, collectionTableGroup, creationState );
+			keyContainerResult = keyDescriptor.createCollectionFecthDomainResult( fetchedPath, collectionTableGroup, creationState );
 
 			// use null for `keyCollectionResult`... the initializer will see that as trigger to use
 			// the assembled container-key value as the collection-key value.