HHH-15449 @manytoone associations not loaded correctly with default E…

…AGER and batch fetch property set when using TypedQuery.resultStream
hibernate · Aug 24, 2022 · 021429b · 021429b
1 parent 960b2c7
commit 021429b
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 1 deletion.
diff --git a/...te-core/src/main/java/org/hibernate/sql/exec/internal/JdbcSelectExecutorStandardImpl.java b/...te-core/src/main/java/org/hibernate/sql/exec/internal/JdbcSelectExecutorStandardImpl.java
@@ -228,6 +228,12 @@ private ExecutionContext getScrollContext(ExecutionContext context, PersistenceC
 		final Limit limit = queryOptions.getLimit();
 
 		return new ExecutionContext() {
+
+			@Override
+			public boolean isScrollResult() {
+				return true;
+			}
+
 			@Override
 			public QueryOptions getQueryOptions() {
 

diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/ExecutionContext.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/ExecutionContext.java
@@ -21,6 +21,10 @@
  */
 public interface ExecutionContext {
 
+	default boolean isScrollResult(){
+		return false;
+	}
+
 	SharedSessionContractImplementor getSession();
 
 	QueryOptions getQueryOptions();

diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/AssemblerCreationState.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/AssemblerCreationState.java
@@ -18,6 +18,10 @@
  */
 public interface AssemblerCreationState {
 
+	default boolean isScrollResult() {
+		return false;
+	}
+
 	LockMode determineEffectiveLockMode(String identificationVariable);
 
 	Initializer resolveInitializer(

diff --git a/.../src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityFetchSelectImpl.java b/.../src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityFetchSelectImpl.java
@@ -69,7 +69,7 @@ public DomainResultAssembler<?> createAssembler(FetchParentAccess parentAccess,
 								keyResult.createResultAssembler( parentAccess, creationState )
 						);
 					}
-					if ( entityPersister.isBatchLoadable() ) {
+					if ( entityPersister.isBatchLoadable() && !creationState.isScrollResult() ) {
 						return new BatchEntitySelectFetchInitializer(
 								parentAccess,
 								fetchedAttribute,

diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/ResultsHelper.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/ResultsHelper.java
@@ -66,6 +66,12 @@ public static <R> RowReader<R> createRowReader(
 
 		final List<DomainResultAssembler<?>> assemblers = jdbcValues.getValuesMapping().resolveAssemblers(
 				new AssemblerCreationState() {
+
+					@Override
+					public boolean isScrollResult() {
+						return executionContext.isScrollResult();
+					}
+
 					@Override
 					public LockMode determineEffectiveLockMode(String identificationVariable) {
 						return lockOptions.getEffectiveLockMode( identificationVariable );