HHH-19449 SqmExpressible should not extend BindableType

Author: gavinking

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

@@ -13,6 +13,7 @@
 import org.hibernate.metamodel.mapping.SelectablePath;
 import org.hibernate.metamodel.mapping.SqlTypedMapping;
 import org.hibernate.metamodel.mapping.internal.SelectableMappingImpl;
+import org.hibernate.query.sqm.SqmBindable;
 import org.hibernate.query.sqm.tree.domain.SqmDomainType;
 import org.hibernate.query.sqm.tuple.internal.AnonymousTupleType;
 import org.hibernate.query.sqm.SqmExpressible;
@@ -53,7 +54,7 @@ public AnonymousTupleType<?> resolveTupleType(List<? extends SqmTypedNode<?>> ar
 			throw new IllegalArgumentException( "Couldn't determine types of arguments to function 'generate_series'" );
 		}
 
-		final SqmExpressible<?>[] componentTypes = new SqmExpressible<?>[]{ type, typeConfiguration.getBasicTypeForJavaType( Long.class ) };
+		final SqmBindable<?>[] componentTypes = new SqmBindable<?>[]{ type, typeConfiguration.getBasicTypeForJavaType( Long.class ) };
 		final String[] componentNames = new String[]{ CollectionPart.Nature.ELEMENT.getName(), CollectionPart.Nature.INDEX.getName() };
 		return new AnonymousTupleType<>( componentTypes, componentNames );
 	}

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

@@ -17,6 +17,7 @@
 import org.hibernate.metamodel.mapping.SelectablePath;
 import org.hibernate.metamodel.mapping.SqlTypedMapping;
 import org.hibernate.metamodel.mapping.internal.SelectableMappingImpl;
+import org.hibernate.query.sqm.SqmBindable;
 import org.hibernate.query.sqm.tuple.internal.AnonymousTupleType;
 import org.hibernate.query.sqm.SqmExpressible;
 import org.hibernate.query.sqm.produce.function.SetReturningFunctionTypeResolver;
@@ -55,7 +56,7 @@ public AnonymousTupleType<?> resolveTupleType(List<? extends SqmTypedNode<?>> ar
 		}
 
 		final BasicType<?> elementType = pluralType.getElementType();
-		final SqmExpressible<?>[] componentTypes;
+		final SqmBindable<?>[] componentTypes;
 		final String[] componentNames;
 		if ( elementType.getJdbcType() instanceof AggregateJdbcType aggregateJdbcType
 			&& aggregateJdbcType.getEmbeddableMappingType() != null ) {
@@ -75,7 +76,7 @@ public AnonymousTupleType<?> resolveTupleType(List<? extends SqmTypedNode<?>> ar
 			componentNames[index] = CollectionPart.Nature.INDEX.getName();
 		}
 		else {
-			componentTypes = new SqmExpressible<?>[]{ elementType, typeConfiguration.getBasicTypeForJavaType( Long.class ) };
+			componentTypes = new SqmBindable<?>[]{ elementType, typeConfiguration.getBasicTypeForJavaType( Long.class ) };
 			componentNames = new String[]{ CollectionPart.Nature.ELEMENT.getName(), CollectionPart.Nature.INDEX.getName() };
 		}
 		return new AnonymousTupleType<>( componentTypes, componentNames );
@@ -208,17 +209,17 @@ public SelectableMapping[] resolveFunctionReturnType(
 		return returnType;
 	}
 
-	private static SqmExpressible<?>[] determineComponentTypes(EmbeddableMappingType embeddableMappingType) {
+	private static SqmBindable<?>[] determineComponentTypes(EmbeddableMappingType embeddableMappingType) {
 		final int numberOfAttributeMappings = embeddableMappingType.getNumberOfAttributeMappings();
-		final ArrayList<SqmExpressible<?>> expressibles = new ArrayList<>( numberOfAttributeMappings + 1 );
+		final ArrayList<SqmBindable<?>> expressibles = new ArrayList<>( numberOfAttributeMappings + 1 );
 
 		for ( int i = 0; i < numberOfAttributeMappings; i++ ) {
 			final AttributeMapping attributeMapping = embeddableMappingType.getAttributeMapping( i );
 			final MappingType mappedType = attributeMapping.getMappedType();
-			if ( mappedType instanceof SqmExpressible<?> sqmExpressible ) {
+			if ( mappedType instanceof SqmBindable<?> sqmExpressible ) {
 				expressibles.add( sqmExpressible );
 			}
 		}
-		return expressibles.toArray( new SqmExpressible<?>[expressibles.size() + 1] );
+		return expressibles.toArray( new SqmBindable<?>[expressibles.size() + 1] );
 	}
 }

hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayConstructorFunction.java

@@ -9,7 +9,7 @@
 import org.hibernate.metamodel.mapping.JdbcMappingContainer;
 import org.hibernate.metamodel.model.domain.ReturnableType;
 import org.hibernate.query.spi.BindingContext;
-import org.hibernate.query.sqm.SqmExpressible;
+import org.hibernate.query.sqm.SqmBindable;
 import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor;
 import org.hibernate.query.sqm.produce.function.ArgumentsValidator;
 import org.hibernate.query.sqm.produce.function.FunctionArgumentException;
@@ -77,9 +77,9 @@ public void validate(
 				String functionName,
 				BindingContext bindingContext) {
 			final int size = arguments.size();
-			SqmExpressible<?> firstType = null;
+			SqmBindable<?> firstType = null;
 			for ( int i = 0; i < size; i++ ) {
-				final SqmExpressible<?> argument = arguments.get( i ).getExpressible();
+				final SqmBindable<?> argument = arguments.get( i ).getExpressible();
 				if ( firstType == null ) {
 					firstType = argument;
 				}

hibernate-core/src/main/java/org/hibernate/metamodel/mapping/DiscriminatorConverter.java

@@ -66,18 +66,18 @@ public O toDomainValue(R relationalForm) {
 
 	@Override
 	public R toRelationalValue(O domainForm) {
-		assert domainForm == null || domainForm instanceof String || domainForm instanceof Class;
-
+		final String entityName;
 		if ( domainForm == null ) {
 			return null;
 		}
-
-		final String entityName;
-		if ( domainForm instanceof Class<?> clazz ) {
+		else if ( domainForm instanceof Class<?> clazz ) {
 			entityName = clazz.getName();
 		}
+		else if ( domainForm instanceof String name ) {
+			entityName = name;
+		}
 		else {
-			entityName = (String) domainForm;
+			throw new IllegalArgumentException( "Illegal discriminator value: " + domainForm );
 		}
 
 		final DiscriminatorValueDetails discriminatorValueDetails = getDetailsForEntityName( entityName );

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

@@ -43,7 +43,7 @@ public <X> X accept(SemanticQueryWalker<X> walker) {
 
 	@Override
 	public AnyDiscriminatorSqmPathSource<T> getExpressible() {
-		return (AnyDiscriminatorSqmPathSource<T>) getNodeType();
-//		return (AnyDiscriminatorSqmPathSource<T>) super.getExpressible();
+//		return (AnyDiscriminatorSqmPathSource<T>) getNodeType();
+		return (AnyDiscriminatorSqmPathSource<T>) getReferencedPathSource();
 	}
 }

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

@@ -7,6 +7,7 @@
 import org.hibernate.annotations.AnyDiscriminator;
 import org.hibernate.metamodel.model.domain.SimpleDomainType;
 import org.hibernate.metamodel.model.domain.ReturnableType;
+import org.hibernate.query.sqm.SqmBindable;
 import org.hibernate.query.sqm.SqmPathSource;
 import org.hibernate.query.sqm.tree.domain.SqmPath;
 import org.hibernate.spi.NavigablePath;
@@ -18,7 +19,7 @@
  *
  */
 public class AnyDiscriminatorSqmPathSource<D> extends AbstractSqmPathSource<D>
-		implements ReturnableType<D> {
+		implements ReturnableType<D>, SqmBindable<D> {
 
 	private final BasicType<D> domainType;
 

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

@@ -13,6 +13,7 @@
 import org.hibernate.metamodel.UnsupportedMappingException;
 import org.hibernate.metamodel.mapping.JdbcMapping;
 import org.hibernate.metamodel.mapping.MappingModelExpressible;
+import org.hibernate.query.sqm.SqmBindable;
 import org.hibernate.query.sqm.tree.domain.SqmDomainType;
 import org.hibernate.query.sqm.tuple.TupleType;
 import org.hibernate.metamodel.model.domain.ReturnableType;
@@ -28,9 +29,9 @@ public class ArrayTupleType implements TupleType<Object[]>,
 		MappingModelExpressible<Object[]> {
 
 	private final ObjectArrayJavaType javaType;
-	private final SqmExpressible<?>[] components;
+	private final SqmBindable<?>[] components;
 
-	public ArrayTupleType(SqmExpressible<?>[] components) {
+	public ArrayTupleType(SqmBindable<?>[] components) {
 		this.components = components;
 		this.javaType = new ObjectArrayJavaType( getTypeDescriptors( components ) );
 	}
@@ -69,12 +70,12 @@ public List<String> getComponentNames() {
 	}
 
 	@Override
-	public SqmExpressible<?> get(int index) {
+	public SqmBindable<?> get(int index) {
 		return components[index];
 	}
 
 	@Override
-	public SqmExpressible<?> get(String componentName) {
+	public SqmBindable<?> get(String componentName) {
 		throw new UnsupportedMappingException( "Array tuple has no component names" );
 	}
 

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

@@ -10,7 +10,6 @@
 import org.hibernate.query.sqm.SqmPathSource;
 import org.hibernate.query.sqm.tree.domain.SqmBasicValuedSimplePath;
 import org.hibernate.query.sqm.tree.domain.SqmPath;
-import org.hibernate.query.sqm.tree.domain.SqmDomainType;
 import org.hibernate.type.descriptor.java.JavaType;
 
 /**
@@ -39,10 +38,10 @@ public String getTypeName() {
 		return super.getTypeName();
 	}
 
-	@Override
-	public SqmDomainType<J> getSqmType() {
-		return getPathType();
-	}
+//	@Override
+//	public SqmDomainType<J> getSqmType() {
+//		return getPathType();
+//	}
 
 	@Override
 	public SqmPathSource<?> findSubPathSource(String name) {

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

@@ -75,7 +75,7 @@ public SqmEmbeddableDomainType<J> getPathType() {
 
 	@Override
 	public SqmEmbeddableDomainType<J> getSqmType() {
-		return SqmEmbeddableDomainType.super.getSqmType();
+		return this;
 	}
 
 	@Override

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

@@ -38,8 +38,8 @@ public EmbeddableDomainType<T> getEmbeddableDomainType() {
 
 	@Override
 	public EmbeddedDiscriminatorSqmPathSource<T> getExpressible() {
-		return (EmbeddedDiscriminatorSqmPathSource<T>) getNodeType();
-//		return (EmbeddedDiscriminatorSqmPathSource<T>) super.getExpressible();
+//		return (EmbeddedDiscriminatorSqmPathSource<T>) getNodeType();
+		return (EmbeddedDiscriminatorSqmPathSource<T>) getReferencedPathSource();
 	}
 
 	@Override