HHH-17045 Add row-id result to EntityJoinedFetchInitializer

hibernate · Aug 28, 2023 · 489466f · 489466f
1 parent 0da986e
commit 489466f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/.../src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityFetchJoinedImpl.java b/.../src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityFetchJoinedImpl.java
@@ -104,6 +104,7 @@ protected EntityInitializer getEntityInitializer(
 						creationState.determineEffectiveLockMode( sourceAlias ),
 						notFoundAction,
 						keyResult,
+						entityResult.getRowIdResult(),
 						entityResult.getIdentifierFetch(),
 						entityResult.getDiscriminatorFetch(),
 						creationState
@@ -121,6 +122,7 @@ protected Initializer buildEntityJoinedFetchInitializer(
 			LockMode lockMode,
 			NotFoundAction notFoundAction,
 			DomainResult<?> keyResult,
+			DomainResult<Object> rowIdResult,
 			Fetch identifierFetch,
 			Fetch discriminatorFetch,
 			AssemblerCreationState creationState) {
@@ -131,6 +133,7 @@ protected Initializer buildEntityJoinedFetchInitializer(
 				lockMode,
 				notFoundAction,
 				keyResult,
+				rowIdResult,
 				identifierFetch,
 				discriminatorFetch,
 				creationState

diff --git a/...in/java/org/hibernate/sql/results/graph/entity/internal/EntityJoinedFetchInitializer.java b/...in/java/org/hibernate/sql/results/graph/entity/internal/EntityJoinedFetchInitializer.java
@@ -42,6 +42,7 @@ public EntityJoinedFetchInitializer(
 			LockMode lockMode,
 			NotFoundAction notFoundAction,
 			DomainResult<?> keyResult,
+			DomainResult<Object> rowIdResult,
 			Fetch identifierFetch,
 			Fetch discriminatorFetch,
 			AssemblerCreationState creationState) {
@@ -51,7 +52,7 @@ public EntityJoinedFetchInitializer(
 				lockMode,
 				identifierFetch,
 				discriminatorFetch,
-				null,
+				rowIdResult,
 				creationState
 		);
 		this.referencedFetchable = referencedFetchable;