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

Author: lvydra

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 @@ public static <R> SqmStatement<R> buildSemanticModel(
 
 	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 @@ private <T> SqmNamedParameter<T> visitNamedParameter(
 			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 @@ private <T> SqmPositionalParameter<T> visitPositionalParameter(
 			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;
 	}