HHH-17530 Handle nested dynamic instantiations when tracking selections

hibernate · Jan 4, 2024 · 8692e3d · 8692e3d
1 parent f0b2eb9
commit 8692e3d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java
@@ -8497,21 +8497,23 @@ private static int countIndividualSelections(List<? extends SqmAliasedNode<?>> s
 			for ( int i = 0; i < selections.size(); i++ ) {
 				final SqmSelectableNode<?> selectableNode = selections.get( i ).getSelectableNode();
 				if ( selectableNode instanceof SqmDynamicInstantiation<?> ) {
-					offset = countIndividualSelections( ( (SqmDynamicInstantiation<?>) selectableNode ).getArguments() ) - 1;
+					offset += countIndividualSelections( ( (SqmDynamicInstantiation<?>) selectableNode ).getArguments() );
 				}
 				else if ( selectableNode instanceof SqmJpaCompoundSelection<?> ) {
 					for ( SqmSelectableNode<?> node : ( (SqmJpaCompoundSelection<?>) selectableNode ).getSelectionItems() ) {
 						if ( node instanceof SqmDynamicInstantiation<?> ) {
-							offset += countIndividualSelections( ( (SqmDynamicInstantiation<?>) node ).getArguments() ) ;
+							offset += countIndividualSelections( ( (SqmDynamicInstantiation<?>) node ).getArguments() );
 						}
 						else {
 							offset += 1;
 						}
 					}
-					offset -= 1;
+				}
+				else {
+					offset += 1;
 				}
 			}
-			return offset + selections.size();
+			return offset;
 		}
 
 		@Override

diff --git a/.../org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationArgument.java b/.../org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationArgument.java
@@ -32,7 +32,9 @@ public ArgumentDomainResult<T> buildArgumentDomainResult(DomainResultCreationSta
 				.getCurrentProcessingState()
 				.getSqlExpressionResolver();
 		if ( sqlExpressionResolver instanceof BaseSqmToSqlAstConverter.SqmAliasedNodeCollector ) {
-			( (BaseSqmToSqlAstConverter.SqmAliasedNodeCollector) sqlExpressionResolver ).next();
+			if ( !( argumentResultProducer instanceof DynamicInstantiation<?> ) ) {
+				( (BaseSqmToSqlAstConverter.SqmAliasedNodeCollector) sqlExpressionResolver ).next();
+			}
 		}
 		return new ArgumentDomainResult<>( argumentResultProducer.createDomainResult( alias, creationState ) );
 	}