HHH-16885 Hibernate 6.x changes outer to inner join when @entitygraph and @id

Author: dreab8

hibernate-core/src/main/java/org/hibernate/metamodel/internal/AbstractCompositeIdentifierMapping.java

@@ -126,13 +126,7 @@ public TableGroupJoin createTableGroupJoin(
 			boolean fetched,
 			boolean addsPredicate,
 			SqlAstCreationState creationState) {
-		final SqlAstJoinType joinType;
-		if ( requestedJoinType == null ) {
-			joinType = SqlAstJoinType.INNER;
-		}
-		else {
-			joinType = requestedJoinType;
-		}
+		final SqlAstJoinType joinType = determineSqlJoinType( lhs, requestedJoinType, fetched );
 		final TableGroup tableGroup = createRootTableGroupJoin(
 				navigablePath,
 				lhs,
@@ -295,4 +289,5 @@ public boolean hasPartitionedSelectionMapping() {
 	public boolean containsTableReference(String tableExpression) {
 		return entityMapping.containsTableReference( tableExpression );
 	}
+
 }

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

@@ -680,22 +680,6 @@ public TableGroupJoin createTableGroupJoin(
 		);
 	}
 
-	private SqlAstJoinType determineSqlJoinType(TableGroup lhs, SqlAstJoinType requestedJoinType, boolean fetched) {
-		final SqlAstJoinType joinType;
-		if ( requestedJoinType == null ) {
-			if ( fetched ) {
-				joinType = getDefaultSqlAstJoinType( lhs );
-			}
-			else {
-				joinType = SqlAstJoinType.INNER;
-			}
-		}
-		else {
-			joinType = requestedJoinType;
-		}
-		return joinType;
-	}
-
 	@Override
 	public TableGroup createRootTableGroupJoin(
 			NavigablePath navigablePath,
@@ -707,9 +691,7 @@ public TableGroup createRootTableGroupJoin(
 			Consumer<Predicate> predicateConsumer,
 			SqlAstCreationState creationState) {
 		final CollectionPersister collectionDescriptor = getCollectionDescriptor();
-		final SqlAstJoinType joinType = requestedJoinType == null
-				? SqlAstJoinType.INNER
-				: requestedJoinType;
+		final SqlAstJoinType joinType = determineSqlJoinType( lhs, requestedJoinType, fetched );
 		final SqlAliasBase sqlAliasBase = creationState.getSqlAliasBaseGenerator().createSqlAliasBase( getSqlAliasStem() );
 
 		final TableGroup tableGroup;
@@ -741,6 +723,7 @@ public TableGroup createRootTableGroupJoin(
 		return tableGroup;
 	}
 
+
 	@Override
 	public void setForeignKeyDescriptor(ForeignKeyDescriptor fkDescriptor) {
 		this.fkDescriptor = fkDescriptor;

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

@@ -1991,22 +1991,6 @@ public TableGroupJoin createTableGroupJoin(
 		return join;
 	}
 
-	private SqlAstJoinType determineSqlJoinType(TableGroup lhs, SqlAstJoinType requestedJoinType, boolean fetched) {
-		final SqlAstJoinType joinType;
-		if ( requestedJoinType == null ) {
-			if ( fetched ) {
-				joinType = getDefaultSqlAstJoinType( lhs );
-			}
-			else {
-				joinType = SqlAstJoinType.INNER;
-			}
-		}
-		else {
-			joinType = requestedJoinType;
-		}
-		return joinType;
-	}
-
 	@Override
 	public LazyTableGroup createRootTableGroupJoin(
 			NavigablePath navigablePath,

hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/TableGroupJoinProducer.java

@@ -76,4 +76,20 @@ TableGroup createRootTableGroupJoin(
 			boolean fetched,
 			Consumer<Predicate> predicateConsumer,
 			SqlAstCreationState creationState);
+
+	default SqlAstJoinType determineSqlJoinType(TableGroup lhs, SqlAstJoinType requestedJoinType, boolean fetched) {
+		final SqlAstJoinType joinType;
+		if ( requestedJoinType == null ) {
+			if ( fetched ) {
+				joinType = getDefaultSqlAstJoinType( lhs );
+			}
+			else {
+				joinType = SqlAstJoinType.INNER;
+			}
+		}
+		else {
+			joinType = requestedJoinType;
+		}
+		return joinType;
+	}
 }