[HHH-16739][JBEAP-30930] Several failures when comparing enum parameters with constant values

hibernate-core/src/main/java/org/hibernate/dialect/function/InverseDistributionFunction.java

@@ -153,8 +153,11 @@ public SelfRenderingInverseDistributionFunction(
 
 		@Override
 		protected ReturnableType<?> resolveResultType(TypeConfiguration typeConfiguration) {
-			return (ReturnableType<?>) withinGroupClause.getSortSpecifications().get( 0 ).getSortExpression()
-						.getExpressible();
+			return (ReturnableType<?>)
+					getWithinGroup().getSortSpecifications().get( 0 )
+							.getSortExpression()
+							.getExpressible()
+							.getSqmType();
 		}
 
 		@Override

hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/DomainType.java

@@ -26,6 +26,12 @@
  * @author Steve Ebersole
  */
 public interface DomainType<J> extends SqmExpressible<J> {
+
+	@Override
+	default DomainType<J> getSqmType() {
+		return this;
+	}
+
 	/**
 	 * The name of the type.
 	 *

hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/EntityDomainType.java

@@ -22,4 +22,9 @@ public interface EntityDomainType<J> extends IdentifiableDomainType<J>, EntityTy
 
 	@Override
 	Collection<? extends EntityDomainType<? extends J>> getSubTypes();
+
+	@Override
+	default DomainType<J> getSqmType() {
+		return this;
+	}
 }

hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/MappedSuperclassDomainType.java

@@ -16,4 +16,8 @@
  * @author Steve Ebersole
  */
 public interface MappedSuperclassDomainType<J> extends IdentifiableDomainType<J>, MappedSuperclassType<J>, SqmPathSource<J> {
+	@Override
+	default DomainType<J> getSqmType() {
+		return IdentifiableDomainType.super.getSqmType();
+	}
 }

hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyDiscriminatorSqmPathSource.java

@@ -6,6 +6,7 @@
  */
 package org.hibernate.metamodel.model.domain.internal;
 
+import org.hibernate.metamodel.model.domain.DomainType;
 import org.hibernate.metamodel.model.domain.SimpleDomainType;
 import org.hibernate.query.ReturnableType;
 import org.hibernate.query.sqm.SqmPathSource;
@@ -61,6 +62,11 @@ public BasicType<D> getSqmPathType() {
 		return (BasicType<D>) super.getSqmPathType();
 	}
 
+	@Override
+	public DomainType<D> getSqmType() {
+		return getSqmPathType();
+	}
+
 	@Override
 	public JavaType<D> getExpressibleJavaType() {
 		return getSqmPathType().getExpressibleJavaType();

hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/BasicSqmPathSource.java

@@ -7,6 +7,7 @@
 package org.hibernate.metamodel.model.domain.internal;
 
 import org.hibernate.metamodel.model.domain.BasicDomainType;
+import org.hibernate.metamodel.model.domain.DomainType;
 import org.hibernate.query.ReturnableType;
 import org.hibernate.query.sqm.SqmPathSource;
 import org.hibernate.query.sqm.tree.domain.SqmBasicValuedSimplePath;
@@ -41,6 +42,11 @@ public BasicDomainType<J> getSqmPathType() {
 		return (BasicDomainType<J>) super.getSqmPathType();
 	}
 
+	@Override
+	public DomainType<J> getSqmType() {
+		return getSqmPathType();
+	}
+
 	@Override
 	public SqmPathSource<?> findSubPathSource(String name) {
 		throw new IllegalStateException( "Basic paths cannot be dereferenced" );

hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/DiscriminatorSqmPathSource.java

@@ -60,4 +60,9 @@ public PersistenceType getPersistenceType() {
 	public Class<D> getJavaType() {
 		return getExpressibleJavaType().getJavaTypeClass();
 	}
+
+	@Override
+	public DomainType<D> getSqmType() {
+		return this;
+	}
 }

hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java

@@ -756,8 +756,7 @@ private String[] doGetImplementors(Class<?> clazz) throws MappingException {
 	@Override
 	public MappingModelExpressible<?> resolveMappingExpressible(
 			SqmExpressible<?> sqmExpressible,
-			Function<NavigablePath,
-					TableGroup> tableGroupLocator) {
+			Function<NavigablePath, TableGroup> tableGroupLocator) {
 		if ( sqmExpressible instanceof SqmPath ) {
 			final SqmPath<?> sqmPath = (SqmPath<?>) sqmExpressible;
 			final NavigablePath navigablePath = sqmPath.getNavigablePath();

hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleType.java

@@ -212,7 +212,7 @@ else if ( sqmPath.getNodeType() instanceof EntityDomainType<?> ) {
 		else {
 			return new AnonymousTupleSimpleSqmPathSource<>(
 					name,
-					(DomainType<? extends Object>) component.getExpressible(),
+					component.getExpressible().getSqmType(),
 					BindableType.SINGULAR_ATTRIBUTE
 			);
 		}
@@ -244,6 +244,11 @@ public DomainType<?> getSqmPathType() {
 		return this;
 	}
 
+	@Override
+	public DomainType<T> getSqmType() {
+		return this;
+	}
+
 	@Override
 	public SqmPath<T> createSqmPath(SqmPath<?> lhs, SqmPathSource<?> intermediatePathSource) {
 		throw new UnsupportedMappingException(

hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java

@@ -26,6 +26,7 @@
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.GregorianCalendar;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
@@ -121,6 +122,7 @@
 import org.hibernate.query.sqm.tree.domain.SqmPath;
 import org.hibernate.query.sqm.tree.domain.SqmPluralValuedSimplePath;
 import org.hibernate.query.sqm.tree.domain.SqmPolymorphicRootDescriptor;
+import org.hibernate.query.sqm.tree.expression.AbstractSqmParameter;
 import org.hibernate.query.sqm.tree.expression.SqmAliasedNodeRef;
 import org.hibernate.query.sqm.tree.expression.SqmAny;
 import org.hibernate.query.sqm.tree.expression.SqmAnyDiscriminatorValue;
@@ -310,6 +312,7 @@
 
 	private ParameterCollector parameterCollector;
 	private ParameterStyle parameterStyle;
+	private Map<Object, AbstractSqmParameter<?>> parameters;
 
 	private boolean isExtractingJdbcTemporalType;
 	// Provides access to the current CTE that is being processed, which is potentially recursive
@@ -3832,14 +3835,14 @@
 			HqlParser.NamedParameterContext ctx,
 			SqmExpressible<T> expressibleType) {
 		parameterStyle = parameterStyle.withNamed();
-		final SqmNamedParameter<T> param = new SqmNamedParameter<>(
-				ctx.getChild( 1 ).getText(),
-				parameterDeclarationContextStack.getCurrent().isMultiValuedBindingAllowed(),
-				expressibleType,
-				creationContext.getNodeBuilder()
+		return resolveParameter(
+				new SqmNamedParameter<>(
+						ctx.getChild( 1 ).getText(),
+						parameterDeclarationContextStack.getCurrent().isMultiValuedBindingAllowed(),
+						expressibleType,
+						creationContext.getNodeBuilder()
+				)
 		);
-		parameterCollector.addParameter( param );
-		return param;
 	}
 
 	@Override
@@ -3854,14 +3857,28 @@
 			throw new SemanticException( "Unlabeled ordinal parameter ('?' rather than ?1)" );
 		}
 		parameterStyle = parameterStyle.withPositional();
-		final SqmPositionalParameter<T> param = new SqmPositionalParameter<>(
-				Integer.parseInt( ctx.getChild( 1 ).getText() ),
-				parameterDeclarationContextStack.getCurrent().isMultiValuedBindingAllowed(),
-				expressibleType,
-				creationContext.getNodeBuilder()
+		return resolveParameter(
+				new SqmPositionalParameter<>(
+						Integer.parseInt( ctx.getChild( 1 ).getText() ),
+						parameterDeclarationContextStack.getCurrent().isMultiValuedBindingAllowed(),
+						expressibleType,
+						creationContext.getNodeBuilder()
+				)
 		);
-		parameterCollector.addParameter( param );
-		return param;
+	}
+
+	private <T extends AbstractSqmParameter<?>> T resolveParameter(T parameter) {
+		if ( parameters == null ) {
+			parameters = new HashMap<>();
+		}
+		final Object key = parameter.getName() == null ? parameter.getPosition() : parameter.getName();
+		final AbstractSqmParameter<?> existingParameter = parameters.putIfAbsent( key, parameter );
+		if ( existingParameter == null ) {
+			parameterCollector.addParameter( parameter );
+			return parameter;
+		}
+		//noinspection unchecked
+		return (T) existingParameter;
 	}
 
 
@@ -4488,7 +4505,7 @@
 		else if ( argumentChild instanceof HqlParser.PredicateContext ) {
 			if ( getCreationOptions().useStrictJpaCompliance() ) {
 				throw new StrictJpaComplianceViolation( StrictJpaComplianceViolation.Type.FUNCTION_CALL );
 			}
 			final SqmExpression<?> argument = (SqmExpression<?>) argumentChild.accept( this );
 
 			return applyOverClause(

hibernate-core/src/main/java/org/hibernate/query/sqm/SqmExpressible.java

@@ -7,6 +7,7 @@
 package org.hibernate.query.sqm;
 
 import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.metamodel.model.domain.DomainType;
 import org.hibernate.query.BindableType;
 import org.hibernate.query.sqm.tree.expression.SqmExpression;
 import org.hibernate.type.descriptor.java.JavaType;
@@ -38,4 +39,6 @@ default boolean isInstance(J value) {
 	default SqmExpressible<J> resolveExpressible(SessionFactoryImplementor sessionFactory) {
 		return this;
 	}
+
+	DomainType<J> getSqmType();
 }

hibernate-core/src/main/java/org/hibernate/query/sqm/SqmPathSource.java

@@ -87,6 +87,11 @@ default SqmExpressible<J> getExpressible() {
 		return (SqmExpressible<J>) getSqmPathType();
 	}
 
+	@Override
+	default DomainType<J> getSqmType() {
+		return (DomainType<J>) getSqmPathType();
+	}
+
 	/**
 	 * Indicates if this path source is generically typed
 	 */

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

@@ -1323,6 +1323,11 @@ public JavaType<T> getExpressibleJavaType() {
 		public Class<T> getBindableJavaType() {
 			return javaType.getJavaTypeClass();
 		}
+
+		@Override
+		public DomainType<T> getSqmType() {
+			return null;
+		}
 	}
 
 	@Override
@@ -1902,8 +1907,8 @@ public <T> SqmCoalesce<T> coalesce() {
 	public <Y> JpaCoalesce<Y> coalesce(Expression<? extends Y> x, Expression<? extends Y> y) {
 		@SuppressWarnings("unchecked")
 		final SqmExpressible<Y> sqmExpressible = (SqmExpressible<Y>) highestPrecedenceType(
-				( (SqmExpression<? extends Y>) x ).getNodeType(),
-				( (SqmExpression<? extends Y>) y ).getNodeType()
+				( (SqmExpression<? extends Y>) x ).getExpressible(),
+				( (SqmExpression<? extends Y>) y ).getExpressible()
 		);
 		return new SqmCoalesce<>(
 				sqmExpressible,
@@ -1934,9 +1939,9 @@ public <Y> SqmExpression<Y> nullif(Expression<Y> x, Y y) {
 	private <Y> SqmExpression<Y> createNullifFunctionNode(SqmExpression<Y> first, SqmExpression<Y> second) {
 		//noinspection unchecked
 		final ReturnableType<Y> type = (ReturnableType<Y>) highestPrecedenceType(
-				first.getNodeType(),
-				second.getNodeType()
-		);
+				first.getExpressible(),
+				second.getExpressible()
+		).getSqmType();
 
 		return getFunctionDescriptor("nullif").generateSqmExpression(
 				asList( first, second ),

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

@@ -32,8 +32,10 @@
 import org.hibernate.query.sqm.SqmPathSource;
 import org.hibernate.query.sqm.sql.SqmToSqlAstConverter;
 import org.hibernate.query.sqm.tree.SqmTypedNode;
+import org.hibernate.query.sqm.tree.cte.SqmCteTable;
 import org.hibernate.query.sqm.tree.domain.AbstractSqmSpecificPluralPartPath;
 import org.hibernate.query.sqm.tree.domain.SqmPath;
+import org.hibernate.query.sqm.tree.domain.SqmPolymorphicRootDescriptor;
 import org.hibernate.query.sqm.tree.domain.SqmTreatedPath;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.tree.from.TableGroup;
@@ -212,13 +214,34 @@ private static ModelPart resolveSqmPath(
 		}
 
 		if ( sqmPath.getLhs() == null ) {
-			final EntityDomainType<?> entityDomainType = (EntityDomainType<?>) sqmPath.getReferencedPathSource();
-			return domainModel.findEntityDescriptor( entityDomainType.getHibernateEntityName() );
+			final SqmPathSource<?> referencedPathSource = sqmPath.getReferencedPathSource();
+			if ( referencedPathSource instanceof EntityDomainType<?> ) {
+				final EntityDomainType<?> entityDomainType = (EntityDomainType<?>) referencedPathSource;
+				return domainModel.findEntityDescriptor( entityDomainType.getHibernateEntityName() );
+			}
+			assert referencedPathSource instanceof SqmCteTable<?>;
+			return null;
 		}
 		final TableGroup lhsTableGroup = tableGroupLocator.apply( sqmPath.getLhs().getNavigablePath() );
 		final ModelPartContainer modelPart;
 		if ( lhsTableGroup == null ) {
 			modelPart = (ModelPartContainer) resolveSqmPath( sqmPath.getLhs(), domainModel, tableGroupLocator );
+			if ( modelPart == null ) {
+				// There are many reasons for why this situation can happen,
+				// but they all boil down to a parameter being compared against a SqmPath.
+
+				// * If the parameter is used in multiple queries (CTE or subquery),
+				// resolving the parameter type based on a SqmPath from a query context other than the current one will fail.
+
+				// * If the parameter is compared to paths with a polymorphic root,
+				// the parameter has a SqmPath set as SqmExpressible
+				// which is still referring to the polymorphic navigable path,
+				// but during query splitting, the SqmRoot in the query is replaced with a root for a subtype.
+				// Unfortunately, we can't copy the parameter to reset the SqmExpressible,
+				// because we currently build only a single DomainParameterXref, instead of one per query split,
+				// so we have to handle this here instead
+				return null;
+			}
 		}
 		else {
 			modelPart = lhsTableGroup.getModelPart();

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

@@ -379,6 +379,7 @@ else if ( domainParamBinding.isMultiValued() ) {
 					final Iterator<?> valueItr = bindValues.iterator();
 
 					// the original SqmParameter is the one we are processing.. create a binding for it..
+					final Object firstValue = valueItr.next();
 					for ( int i = 0; i < jdbcParamsBinds.size(); i++ ) {
 						final JdbcParametersList jdbcParams = jdbcParamsBinds.get( i );
 						createValueBindings(
@@ -387,31 +388,38 @@ else if ( domainParamBinding.isMultiValued() ) {
 								domainParamBinding,
 								parameterType,
 								jdbcParams,
-								valueItr.next(),
+								firstValue,
 								tableGroupLocator,
 								session
 						);
 					}
 
 					// an then one for each of the expansions
 					final List<SqmParameter<?>> expansions = domainParameterXref.getExpansions( sqmParameter );
-					assert expansions.size() == bindValues.size() - 1;
+					final int expansionCount = bindValues.size() - 1;
+					final int parameterUseCount = jdbcParamsBinds.size();
+					assert expansions.size() == expansionCount * parameterUseCount;
 					int expansionPosition = 0;
 					while ( valueItr.hasNext() ) {
-						final SqmParameter<?> expansionSqmParam = expansions.get( expansionPosition++ );
-						final List<JdbcParametersList> jdbcParamBinds = jdbcParamMap.get( expansionSqmParam );
-						for ( int i = 0; i < jdbcParamBinds.size(); i++ ) {
-							JdbcParametersList expansionJdbcParams = jdbcParamBinds.get( i );
-							createValueBindings(
-									jdbcParameterBindings,
-									queryParam, domainParamBinding,
-									parameterType,
-									expansionJdbcParams,
-									valueItr.next(),
-									tableGroupLocator,
-									session
-							);
+						final Object expandedValue = valueItr.next();
+						for ( int j = 0; j < parameterUseCount; j++ ) {
+							final SqmParameter<?> expansionSqmParam = expansions.get( expansionPosition + j * expansionCount );
+							final List<JdbcParametersList> jdbcParamBinds = jdbcParamMap.get( expansionSqmParam );
+							for ( int i = 0; i < jdbcParamBinds.size(); i++ ) {
+								JdbcParametersList expansionJdbcParams = jdbcParamBinds.get( i );
+								createValueBindings(
+										jdbcParameterBindings,
+										queryParam,
+										domainParamBinding,
+										parameterType,
+										expansionJdbcParams,
+										expandedValue,
+										tableGroupLocator,
+										session
+								);
+							}
 						}
+						expansionPosition++;
 					}
 				}
 				else if ( domainParamBinding.getBindValue() == null ) {