HHH-19781 Copy original criteria to avoid duplicated specifications

Also avoid double-copy for HQL-based specifications

Author: mbellade

hibernate-core/src/main/java/org/hibernate/query/specification/internal/MutationSpecificationImpl.java

@@ -41,6 +41,7 @@
 import java.util.function.BiConsumer;
 
 import static org.hibernate.query.sqm.tree.SqmCopyContext.noParamCopyContext;
+import static org.hibernate.query.sqm.tree.SqmCopyContext.simpleContext;
 
 /**
  * Standard implementation of MutationSpecification
@@ -124,7 +125,7 @@ public MutationQuery createQuery(StatelessSession session) {
 	public MutationQuery createQuery(SharedSessionContract session) {
 		final var sessionImpl = session.unwrap(SharedSessionContractImplementor.class);
 		final SqmDeleteOrUpdateStatement<T> sqmStatement = build( sessionImpl.getFactory().getQueryEngine() );
-		return new SqmQueryImpl<>( sqmStatement, true, null, sessionImpl );
+		return new SqmQueryImpl<>( sqmStatement, false, null, sessionImpl );
 	}
 
 	private SqmDeleteOrUpdateStatement<T> build(QueryEngine queryEngine) {
@@ -135,7 +136,8 @@ private SqmDeleteOrUpdateStatement<T> build(QueryEngine queryEngine) {
 			mutationTargetRoot = resolveSqmRoot( sqmStatement, mutationTarget );
 		}
 		else if ( deleteOrUpdateStatement != null ) {
-			sqmStatement = deleteOrUpdateStatement;
+			sqmStatement = (SqmDeleteOrUpdateStatement<T>) deleteOrUpdateStatement
+					.copy( simpleContext() );
 			mutationTargetRoot = resolveSqmRoot( sqmStatement,
 					sqmStatement.getTarget().getManagedType().getJavaType() );
 		}

hibernate-core/src/main/java/org/hibernate/query/specification/internal/SelectionSpecificationImpl.java

@@ -46,6 +46,7 @@
 import static org.hibernate.internal.util.collections.CollectionHelper.isEmpty;
 import static org.hibernate.query.sqm.internal.SqmUtil.validateCriteriaQuery;
 import static org.hibernate.query.sqm.tree.SqmCopyContext.noParamCopyContext;
+import static org.hibernate.query.sqm.tree.SqmCopyContext.simpleContext;
 
 /**
  * Standard implementation of SelectionSpecification
@@ -166,7 +167,7 @@ public SelectionQuery<T> createQuery(StatelessSession session) {
 	public SelectionQuery<T> createQuery(SharedSessionContract session) {
 		final var sessionImpl = session.unwrap(SharedSessionContractImplementor.class);
 		final SqmSelectStatement<T> sqmStatement = build( sessionImpl.getFactory().getQueryEngine() );
-		return new SqmSelectionQueryImpl<>( sqmStatement, true, resultType, sessionImpl );
+		return new SqmSelectionQueryImpl<>( sqmStatement, false, resultType, sessionImpl );
 	}
 
 	private SqmSelectStatement<T> build(QueryEngine queryEngine) {
@@ -177,7 +178,7 @@ private SqmSelectStatement<T> build(QueryEngine queryEngine) {
 			sqmRoot = extractRoot( sqmStatement, resultType, hql );
 		}
 		else if ( criteriaQuery != null ) {
-			sqmStatement = (SqmSelectStatement<T>) criteriaQuery;
+			sqmStatement = ((SqmSelectStatement<T>) criteriaQuery).copy( simpleContext() );
 			sqmRoot = extractRoot( sqmStatement, resultType, "criteria query" );
 		}
 		else {