HHH-15497 Count query when counting polymorphic subclasses by type fails when run twice

Author: dreab8

hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingImpl.java

@@ -51,9 +51,7 @@ public class QueryParameterBindingImpl<T> implements QueryParameterBinding<T>, J
 	protected QueryParameterBindingImpl(
 			QueryParameter<T> queryParameter,
 			SessionFactoryImplementor sessionFactory) {
-		this.queryParameter = queryParameter;
-		this.sessionFactory = sessionFactory;
-		this.bindType = queryParameter.getHibernateType();
+		this( queryParameter, sessionFactory, queryParameter.getHibernateType() );
 	}
 
 	/**

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

@@ -181,6 +181,7 @@
 import org.hibernate.query.sqm.tree.domain.SqmPluralValuedSimplePath;
 import org.hibernate.query.sqm.tree.domain.SqmTreatedPath;
 import org.hibernate.query.sqm.tree.domain.SqmTreatedRoot;
+import org.hibernate.query.sqm.tree.expression.AbstractSqmExpression;
 import org.hibernate.query.sqm.tree.expression.Conversion;
 import org.hibernate.query.sqm.tree.expression.JpaCriteriaParameter;
 import org.hibernate.query.sqm.tree.expression.SqmAliasedNodeRef;
@@ -4890,11 +4891,8 @@ protected Expression consumeSqmParameter(
 		final QueryParameterImplementor<?> queryParameter = domainParameterXref.getQueryParameter( sqmParameter );
 		final QueryParameterBinding binding = domainParameterBindings.getBinding( queryParameter );
 		if ( binding.setType( valueMapping ) ) {
-			replaceJdbcParametersType(
-					sqmParameter,
-					domainParameterXref.getSqmParameters( queryParameter ),
-					valueMapping
-			);
+			// Align the SqmParameter expressible type with the binding type
+			( (AbstractSqmExpression) sqmParameter ).forceInferableType( (SqmExpressible<?>) binding.getBindType() );
 		}
 		return new SqmParameterInterpretation(
 				sqmParameter,
@@ -6802,6 +6800,8 @@ private Predicate processInSingleParameter(
 
 		if ( !iterator.hasNext() ) {
 			domainParamBinding.setType( (MappingModelExpressible) determineValueMapping( sqmPredicate.getTestExpression(), fromClauseIndex ) );
+			// Align the SqmParameter expressible type with the binding type
+			( (AbstractSqmExpression) sqmParameter ).forceInferableType( (SqmExpressible<?>) domainParamBinding.getBindType() );
 			return inListPredicate;
 		}
 

hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/AbstractSqmExpression.java

@@ -156,4 +156,8 @@ public JpaSelection<T> alias(String name) {
 	public JavaType<T> getJavaTypeDescriptor() {
 		return getNodeType() == null ? null : getNodeType().getExpressibleJavaType();
 	}
+
+	public void forceInferableType(SqmExpressible<?> type){
+		setExpressibleType( type );
+	}
 }