HHH-16897 Push a where clause to stack before combining predicates

Author: marko-bekhta

hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/MultiTableSqmMutationConverter.java

@@ -27,6 +27,7 @@
 import org.hibernate.query.sqm.tree.insert.SqmInsertStatement;
 import org.hibernate.query.sqm.tree.predicate.SqmWhereClause;
 import org.hibernate.query.sqm.tree.update.SqmSetClause;
+import org.hibernate.sql.ast.Clause;
 import org.hibernate.sql.ast.spi.SqlAstCreationContext;
 import org.hibernate.sql.ast.spi.SqlAstHelper;
 import org.hibernate.sql.ast.spi.SqlAstProcessingState;
@@ -214,12 +215,14 @@ public Expression resolveSqlExpression(
 
 		pushProcessingState( restrictionProcessingState, getFromClauseIndex() );
 		try {
+			getCurrentClauseStack().push( Clause.WHERE );
 			return SqlAstHelper.combinePredicates(
 					(Predicate) sqmWhereClause.getPredicate().accept( this ),
 					discriminatorPredicate
 			);
 		}
 		finally {
+			getCurrentClauseStack().pop();
 			popProcessingStateStack();
 			this.parameterResolutionConsumer = null;
 		}