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/internal/SqmUtil.java

@@ -204,6 +204,11 @@ public static JdbcParameterBindings createJdbcParameterBindings(
 
 			final Map<SqmParameter<?>, List<List<JdbcParameter>>> jdbcParamMap = jdbcParamXref.get( queryParam );
 			for ( SqmParameter<?> sqmParameter : sqmParameters ) {
+				final MappingModelExpressible resolvedMappingModelType = mappingModelResolutionAccess
+						.getResolvedMappingModelType( sqmParameter );
+				if ( resolvedMappingModelType != null ) {
+					domainParamBinding.setType( resolvedMappingModelType );
+				}
 				final Bindable parameterType = determineParameterType(
 						domainParamBinding,
 						queryParam,

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;
@@ -4889,13 +4890,7 @@ 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
-			);
-		}
+		binding.setType( valueMapping );
 		return new SqmParameterInterpretation(
 				sqmParameter,
 				queryParameter,