HHH-16198 - Fix splitting of SqlAstCreationState

Author: beikov

hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java

@@ -907,7 +907,6 @@ public void addVersionedAssignment(Consumer<Assignment> assignmentConsumer, SqmU
 	@Override
 	public List<Assignment> visitSetClause(SqmSetClause setClause) {
 		final ArrayList<Assignment> assignments = new ArrayList<>( setClause.getAssignments().size() );
-		final ArrayList<ColumnReference> targetColumnReferences = new ArrayList<>( 1 );
 
 		final SqmRoot<?> target = ( (SqmDmlStatement<?>) currentSqmStatement ).getTarget();
 		final String entityName = target.getEntityName();
@@ -924,12 +923,14 @@ public List<Assignment> visitSetClause(SqmSetClause setClause) {
 		);
 
 		for ( SqmAssignment<?> sqmAssignment : setClause.getAssignments() ) {
-			targetColumnReferences.clear();
-
 			final SqmPathInterpretation<?> assignedPathInterpretation;
 			try {
 				pushProcessingState(
-						createAssignmentProcessingState( targetColumnReferences ),
+						new SqlAstProcessingStateImpl(
+								getCurrentProcessingState(),
+								this,
+								getCurrentClauseStack()::getCurrent
+						),
 						getFromClauseIndex()
 				);
 				currentClauseStack.push( Clause.SET );
@@ -947,6 +948,15 @@ public List<Assignment> visitSetClause(SqmSetClause setClause) {
 
 				final SqmExpression<?> assignmentValue = sqmAssignment.getValue();
 				final SqmParameter<?> assignmentValueParameter = getSqmParameter( assignmentValue );
+				final Expression pathSqlExpression = assignedPathInterpretation.getSqlExpression();
+				final List<ColumnReference> targetColumnReferences;
+				if ( pathSqlExpression instanceof SqlTuple ) {
+					//noinspection unchecked
+					targetColumnReferences = (List<ColumnReference>) ( (SqlTuple) pathSqlExpression ).getExpressions();
+				}
+				else {
+					targetColumnReferences = pathSqlExpression.getColumnReference().getColumnReferences();
+				}
 				if ( assignmentValueParameter != null ) {
 					consumeSqmParameter(
 							assignmentValueParameter,
@@ -1013,22 +1023,6 @@ else if ( assignmentValue instanceof SqmLiteralNull<?> ) {
 		return assignments;
 	}
 
-	private SqlAstProcessingStateImpl createAssignmentProcessingState(ArrayList<ColumnReference> targetColumnReferences) {
-		return new SqlAstProcessingStateImpl( getCurrentProcessingState(), this, getCurrentClauseStack()::getCurrent ) {
-			@Override
-			public Expression resolveSqlExpression(
-					ColumnReferenceKey key,
-					Function<SqlAstProcessingState, Expression> creator) {
-				final Expression expression = getParentState()
-						.getSqlExpressionResolver()
-						.resolveSqlExpression( key, creator );
-				assert expression instanceof ColumnReference;
-				targetColumnReferences.add( (ColumnReference) expression );
-				return expression;
-			}
-		};
-	}
-
 	private void addAssignment(
 			List<Assignment> assignments,
 			AggregateColumnAssignmentHandler aggregateColumnAssignmentHandler,