HHH-19449 have BindableType inherit JPA's Type

gavinking · gavinking · commit 64370d52b2bc · 2025-05-12T06:23:24.000+02:00
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/SimpleDomainType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/SimpleDomainType.java
@@ -12,7 +12,7 @@
  * @author Steve Ebersole
  */
 public interface SimpleDomainType<J>
-		extends DomainType<J>, BindableType<J>, jakarta.persistence.metamodel.Type<J> {
+		extends DomainType<J>, BindableType<J> {
 	@Override
 	default Class<J> getBindableJavaType() {
 		return getJavaType();
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/ArrayTupleType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/ArrayTupleType.java
@@ -91,7 +91,7 @@ public PersistenceType getPersistenceType() {
 
 	@Override
 	public Class<Object[]> getJavaType() {
-		return this.getExpressibleJavaType().getJavaTypeClass();
+		return getExpressibleJavaType().getJavaTypeClass();
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/BasicTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/BasicTypeImpl.java
@@ -46,7 +46,7 @@ public JavaType<J> getExpressibleJavaType() {
 
 	@Override
 	public Class<J> getJavaType() {
-		return this.getExpressibleJavaType().getJavaTypeClass();
+		return getExpressibleJavaType().getJavaTypeClass();
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/BindableType.java b/hibernate-core/src/main/java/org/hibernate/query/BindableType.java
@@ -4,6 +4,7 @@
  */
 package org.hibernate.query;
 
+import jakarta.persistence.metamodel.Type;
 import org.hibernate.Incubating;
 
 /**
@@ -21,9 +22,14 @@
  * @author Steve Ebersole
  */
 @Incubating
-public interface BindableType<J> {
+public interface BindableType<J> extends Type<J> {
 	/**
 	 * The expected Java type of the argument to the query parameter.
 	 */
 	Class<J> getBindableJavaType();
+
+	@Override
+	default Class<J> getJavaType() {
+		return getBindableJavaType();
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaTupleElement.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaTupleElement.java
@@ -21,11 +21,13 @@ public interface JpaTupleElement<T> extends TupleElement<T>, JpaCriteriaNode {
 	@Override
 	default @Nullable Class<? extends T> getJavaType() {
 		// todo (6.0) : can this signature just return `Class<T>`?
-		return getJavaTypeDescriptor() == null ? null : getJavaTypeDescriptor().getJavaTypeClass();
+		final JavaType<T> javaType = getJavaTypeDescriptor();
+		return javaType == null ? null : javaType.getJavaTypeClass();
 	}
 
 	default String getJavaTypeName() {
-		return getJavaTypeDescriptor() == null ? null : getJavaTypeDescriptor().getTypeName();
+		final JavaType<T> javaType = getJavaTypeDescriptor();
+		return javaType == null ? null : javaType.getTypeName();
 	}
 
 	default boolean isEnum() {
diff --git a/hibernate-core/src/main/java/org/hibernate/query/specification/internal/SelectionSpecificationImpl.java b/hibernate-core/src/main/java/org/hibernate/query/specification/internal/SelectionSpecificationImpl.java
@@ -14,7 +14,6 @@
 import org.hibernate.SharedSessionContract;
 import org.hibernate.StatelessSession;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.internal.util.collections.CollectionHelper;
 import org.hibernate.query.IllegalSelectQueryException;
 import org.hibernate.query.Order;
 import org.hibernate.query.SelectionQuery;
@@ -44,6 +43,7 @@
 import java.util.Set;
 import java.util.function.BiConsumer;
 
+import static org.hibernate.internal.util.collections.CollectionHelper.isEmpty;
 import static org.hibernate.query.sqm.internal.SqmUtil.validateCriteriaQuery;
 import static org.hibernate.query.sqm.tree.SqmCopyContext.noParamCopyContext;
 
@@ -299,7 +299,7 @@ private void validateResultType(
 
 		final SqmSelectClause sqmSelectClause = sqmStatement.getQuerySpec().getSelectClause();
 		final List<SqmSelection<?>> sqmSelections = sqmSelectClause.getSelections();
-		if ( CollectionHelper.isEmpty( sqmSelections ) ) {
+		if ( isEmpty( sqmSelections ) ) {
 			// implicit select clause, verify that resultType matches the root type
 			if ( resultType.isAssignableFrom( rootJavaType ) ) {
 				// it does, we are fine
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/SqmBindable.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/SqmBindable.java
@@ -8,8 +8,10 @@
 import org.hibernate.query.spi.BindingContext;
 
 /**
- * @param <J>
+ * An SQM node which may be used to disambiguate the type of an argument to a query parameter.
+ *
  * @author Gavin King
+ *
  * @since 7.0
  */
 public interface SqmBindable<J> extends SqmExpressible<J>, BindableTypeImplementor<J> {
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/SqmExpressible.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/SqmExpressible.java
@@ -10,7 +10,7 @@
 
 /**
  * Anything in the application domain model that can be used in an
- * SQM query as an expression
+ * SQM query as an expression.
  *
  * @see SqmExpression#getNodeType
  *
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java
@@ -1653,6 +1653,11 @@ public MultiValueParameterType(Class<T> type) {
 			this.javaType = getTypeConfiguration().getJavaTypeRegistry().getDescriptor( type );
 		}
 
+		@Override
+		public PersistenceType getPersistenceType() {
+			return PersistenceType.BASIC;
+		}
+
 		@Override
 		public JavaType<T> getExpressibleJavaType() {
 			return javaType;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmUtil.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmUtil.java
@@ -55,6 +55,7 @@
 import org.hibernate.query.spi.QueryParameterBindings;
 import org.hibernate.query.spi.QueryParameterImplementor;
 import org.hibernate.query.sqm.NodeBuilder;
+import org.hibernate.query.sqm.SqmBindable;
 import org.hibernate.query.sqm.SqmExpressible;
 import org.hibernate.query.sqm.SqmPathSource;
 import org.hibernate.query.sqm.SqmQuerySource;
@@ -1218,7 +1219,7 @@ private static <T> void verifySelectionType(
 		}
 
 		if ( !jpaCompliance.isJpaQueryComplianceEnabled() ) {
-			verifyResultType( expectedResultClass, selection.getExpressible() );
+			verifyResultType( expectedResultClass, selection );
 		}
 	}
 
@@ -1239,15 +1240,17 @@ public static boolean isResultTypeAlwaysAllowed(Class<?> expectedResultClass) {
 			|| expectedResultClass == Tuple.class;
 	}
 
-	protected static void verifyResultType(Class<?> resultClass, @Nullable SqmExpressible<?> selectionExpressible) {
-		if ( selectionExpressible != null ) {
-			final JavaType<?> javaType = selectionExpressible.getExpressibleJavaType();
-			if ( javaType != null ) {
-				final Class<?> javaTypeClass = javaType.getJavaTypeClass();
-				if ( javaTypeClass != Object.class ) {
-					if ( !isValid( resultClass, selectionExpressible, javaTypeClass, javaType ) ) {
-						throwQueryTypeMismatchException( resultClass, selectionExpressible );
-					}
+	protected static void verifyResultType(Class<?> resultClass, SqmSelectableNode<?> selectableNode) {
+		final SqmBindable<?> selectionExpressible = selectableNode.getExpressible();
+		final JavaType<?> javaType =
+				selectionExpressible == null
+						? selectableNode.getNodeJavaType() // for SqmDynamicInstantiation
+						: selectionExpressible.getExpressibleJavaType();
+		if ( javaType != null ) {
+			final Class<?> javaTypeClass = javaType.getJavaTypeClass();
+			if ( javaTypeClass != Object.class ) {
+				if ( !isValid( resultClass, selectionExpressible, javaTypeClass, javaType ) ) {
+					throwQueryTypeMismatchException( resultClass, selectionExpressible, javaTypeClass );
 				}
 			}
 		}
@@ -1313,11 +1316,13 @@ private static boolean isMatchingDateJdbcType(Class<?> resultClass, JdbcType jdb
 		}
 	}
 
-	private static void throwQueryTypeMismatchException(Class<?> resultClass, SqmExpressible<?> sqmExpressible) {
+	private static void throwQueryTypeMismatchException(
+			Class<?> resultClass,
+			@Nullable SqmExpressible<?> sqmExpressible, @Nullable Class<?> javaTypeClass) {
 		throw new QueryTypeMismatchException( String.format(
 				Locale.ROOT,
 				"Incorrect query result type: query produces '%s' but type '%s' was given",
-				sqmExpressible.getTypeName(),
+				sqmExpressible == null ? javaTypeClass.getName() : sqmExpressible.getTypeName(),
 				resultClass.getName()
 		) );
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmBasicValuedSimplePath.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmBasicValuedSimplePath.java
@@ -77,6 +77,11 @@ public SqmBindable<T> getExpressible() {
 		return this;
 	}
 
+	@Override
+	public PersistenceType getPersistenceType() {
+		return PersistenceType.BASIC;
+	}
+
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	// SemanticPathPart
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmDomainType.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmDomainType.java
@@ -23,4 +23,7 @@ default String getTypeName() {
 	default int getTupleLength() {
 		return 1;
 	}
+
+	@Override
+	Class<T> getJavaType();
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmEmbeddedValuedSimplePath.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmEmbeddedValuedSimplePath.java
@@ -71,6 +71,11 @@ public SqmBindable<T> getExpressible() {
 		return this;
 	}
 
+	@Override
+	public PersistenceType getPersistenceType() {
+		return PersistenceType.EMBEDDABLE;
+	}
+
 	@Override
 	public SqmDomainType<T> getSqmType() {
 		return getResolvedModel().getSqmType();
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmManagedDomainType.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmManagedDomainType.java
@@ -12,6 +12,11 @@ public interface SqmManagedDomainType<J> extends ManagedDomainType<J>, SqmDomain
 	@Override
 	String getTypeName();
 
+	@Override
+	default Class<J> getJavaType() {
+		return ManagedDomainType.super.getJavaType();
+	}
+
 	@Override
 	SqmPersistentAttribute<? super J, ?> findAttribute(String name);
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmMapEntryReference.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmMapEntryReference.java
@@ -72,12 +72,23 @@ public SqmPath<?> getMapPath() {
 		return mapPath;
 	}
 
+	@Override @SuppressWarnings("unchecked")
+	public Class<Map.Entry<K, V>> getJavaType() {
+		final Class<?> entryClass = Map.Entry.class;
+		return (Class<Map.Entry<K, V>>) entryClass;
+	}
+
 	@Override
 	public JpaSelection<Map.Entry<K, V>> alias(String name) {
 		this.explicitAlias = name;
 		return this;
 	}
 
+	@Override
+	public PersistenceType getPersistenceType() {
+		return PersistenceType.EMBEDDABLE;
+	}
+
 	@Override
 	public JavaType<Map.Entry<K, V>> getJavaTypeDescriptor() {
 		return mapEntryTypeDescriptor;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/NullSqmExpressible.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/NullSqmExpressible.java
@@ -17,6 +17,11 @@ public class NullSqmExpressible implements SqmBindable<Object> {
 	 */
 	public static final NullSqmExpressible NULL_SQM_EXPRESSIBLE = new NullSqmExpressible();
 
+	@Override
+	public PersistenceType getPersistenceType() {
+		return PersistenceType.BASIC;
+	}
+
 	@Override
 	public Class<Object> getBindableJavaType() {
 		return null;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmEnumLiteral.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmEnumLiteral.java
@@ -67,6 +67,16 @@ public SqmBindable<E> getExpressible() {
 		return this;
 	}
 
+	@Override
+	public PersistenceType getPersistenceType() {
+		return PersistenceType.BASIC;
+	}
+
+	@Override
+	public Class<E> getJavaType() {
+		return getBindableJavaType();
+	}
+
 	@Override
 	public SqmDomainType<E> getSqmType() {
 		return null;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmFieldLiteral.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmFieldLiteral.java
@@ -33,7 +33,8 @@
 /**
  * @author Steve Ebersole
  */
-public class SqmFieldLiteral<T> implements SqmExpression<T>, SqmBindable<T>, SqmSelectableNode<T>, SemanticPathPart {
+public class SqmFieldLiteral<T>
+		implements SqmExpression<T>, SqmBindable<T>, SqmSelectableNode<T>, SemanticPathPart {
 	private final T value;
 	private final JavaType<T> fieldJavaType;
 	private final String fieldName;
@@ -66,6 +67,16 @@ public SqmFieldLiteral(
 		this.expressible = this;
 	}
 
+	@Override
+	public PersistenceType getPersistenceType() {
+		return PersistenceType.BASIC;
+	}
+
+	@Override
+	public Class<T> getJavaType() {
+		return getBindableJavaType();
+	}
+
 	private static <T> T extractValue(Field field) {
 		try {
 			//noinspection unchecked
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmLiteralNull.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmLiteralNull.java
@@ -15,11 +15,9 @@
  */
 public class SqmLiteralNull<T> extends SqmLiteral<T> {
 
-	private static final SqmBindable<Object> NULL_TYPE = NullSqmExpressible.NULL_SQM_EXPRESSIBLE;
-
 	public SqmLiteralNull(NodeBuilder nodeBuilder) {
 		//noinspection unchecked
-		this( (SqmBindable<T>) NULL_TYPE, nodeBuilder );
+		this( (SqmBindable<T>) NullSqmExpressible.NULL_SQM_EXPRESSIBLE, nodeBuilder );
 	}
 
 	public SqmLiteralNull(SqmBindable<T> expressibleType, NodeBuilder nodeBuilder) {
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmDynamicInstantiation.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmDynamicInstantiation.java
@@ -9,6 +9,7 @@
 import java.util.Map;
 import java.util.function.Consumer;
 
+import org.checkerframework.checker.nullness.qual.Nullable;
 import org.hibernate.query.sqm.DynamicInstantiationNature;
 import org.hibernate.query.criteria.JpaCompoundSelection;
 import org.hibernate.query.sqm.NodeBuilder;
@@ -17,8 +18,8 @@
 import org.hibernate.query.sqm.SqmExpressible;
 import org.hibernate.query.sqm.tree.SqmCopyContext;
 import org.hibernate.query.sqm.tree.SqmRenderContext;
-import org.hibernate.query.sqm.tree.expression.SqmExpression;
 import org.hibernate.query.sqm.tree.domain.SqmDomainType;
+import org.hibernate.query.sqm.tree.expression.SqmExpression;
 import org.hibernate.query.sqm.tree.jpa.AbstractJpaSelection;
 import org.hibernate.type.descriptor.java.JavaType;
 
@@ -110,15 +111,15 @@ public static <L extends List<?>> SqmDynamicInstantiation<L> listInstantiation(
 	private SqmDynamicInstantiation(
 			SqmDynamicInstantiationTarget<T> instantiationTarget,
 			NodeBuilder nodeBuilder) {
-		super( instantiationTarget, nodeBuilder );
+		super( instantiationTarget.getSqmType(), nodeBuilder );
 		this.instantiationTarget = instantiationTarget;
 	}
 
 	private SqmDynamicInstantiation(
 			SqmDynamicInstantiationTarget<T> instantiationTarget,
 			List<? extends SqmSelectableNode<?>> arguments,
 			NodeBuilder nodeBuilder) {
-		super( instantiationTarget, nodeBuilder );
+		super( instantiationTarget.getSqmType(), nodeBuilder );
 		this.instantiationTarget = instantiationTarget;
 		for ( SqmSelectableNode<?> argument : arguments ) {
 			final SqmDynamicInstantiationArgument<?> arg =
@@ -300,11 +301,15 @@ public SqmDynamicInstantiation<T> makeShallowCopy() {
 		return new SqmDynamicInstantiation<>( getInstantiationTarget(), nodeBuilder() );
 	}
 
+	@Override
+	public @Nullable JavaType<T> getNodeJavaType() {
+		return instantiationTarget.getExpressibleJavaType();
+	}
+
 	private static class DynamicInstantiationTargetImpl<T> implements SqmDynamicInstantiationTarget<T> {
 		private final DynamicInstantiationNature nature;
 		private final JavaType<T> javaType;
 
-
 		private DynamicInstantiationTargetImpl(DynamicInstantiationNature nature, JavaType<T> javaType) {
 			this.nature = nature;
 			this.javaType = javaType;
@@ -325,10 +330,10 @@ public JavaType<T> getExpressibleJavaType() {
 			return getTargetTypeDescriptor();
 		}
 
-		@Override
-		public Class<T> getBindableJavaType() {
-			return getTargetTypeDescriptor().getJavaTypeClass();
-		}
+//		@Override
+//		public Class<T> getBindableJavaType() {
+//			return getTargetTypeDescriptor().getJavaTypeClass();
+//		}
 
 		@Override
 		public SqmDomainType<T> getSqmType() {
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmDynamicInstantiationTarget.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmDynamicInstantiationTarget.java
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmJpaCompoundSelection.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmJpaCompoundSelection.java
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelection.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelection.java
diff --git a/hibernate-core/src/main/java/org/hibernate/type/AbstractStandardBasicType.java b/hibernate-core/src/main/java/org/hibernate/type/AbstractStandardBasicType.java
diff --git a/hibernate-core/src/main/java/org/hibernate/type/BasicType.java b/hibernate-core/src/main/java/org/hibernate/type/BasicType.java
diff --git a/hibernate-core/src/main/java/org/hibernate/type/BasicTypeReference.java b/hibernate-core/src/main/java/org/hibernate/type/BasicTypeReference.java
diff --git a/hibernate-core/src/main/java/org/hibernate/type/ComponentType.java b/hibernate-core/src/main/java/org/hibernate/type/ComponentType.java
diff --git a/hibernate-core/src/main/java/org/hibernate/type/internal/ConvertedBasicTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/type/internal/ConvertedBasicTypeImpl.java

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ public PersistenceType getPersistenceType() {`
`91`	`91`
`92`	`92`	`@Override`
`93`	`93`	`public Class<Object[]> getJavaType() {`
`94`		`- return this.getExpressibleJavaType().getJavaTypeClass();`
	`94`	`+ return getExpressibleJavaType().getJavaTypeClass();`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public JavaType<J> getExpressibleJavaType() {`
`46`	`46`
`47`	`47`	`@Override`
`48`	`48`	`public Class<J> getJavaType() {`
`49`		`- return this.getExpressibleJavaType().getJavaTypeClass();`
	`49`	`+ return getExpressibleJavaType().getJavaTypeClass();`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -21,11 +21,13 @@ public interface JpaTupleElement<T> extends TupleElement<T>, JpaCriteriaNode {`
`21`	`21`	`@Override`
`22`	`22`	`default @Nullable Class<? extends T> getJavaType() {`
`23`	`23`	// todo (6.0) : can this signature just return `Class<T>`?
`24`		`- return getJavaTypeDescriptor() == null ? null : getJavaTypeDescriptor().getJavaTypeClass();`
	`24`	`+ final JavaType<T> javaType = getJavaTypeDescriptor();`
	`25`	`+ return javaType == null ? null : javaType.getJavaTypeClass();`
`25`	`26`	`}`
`26`	`27`
`27`	`28`	`default String getJavaTypeName() {`
`28`		`- return getJavaTypeDescriptor() == null ? null : getJavaTypeDescriptor().getTypeName();`
	`29`	`+ final JavaType<T> javaType = getJavaTypeDescriptor();`
	`30`	`+ return javaType == null ? null : javaType.getTypeName();`
`29`	`31`	`}`
`30`	`32`
`31`	`33`	`default boolean isEnum() {`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`
`11`	`11`	`/**`
`12`	`12`	`* Anything in the application domain model that can be used in an`
`13`		`- * SQM query as an expression`
	`13`	`+ * SQM query as an expression.`
`14`	`14`	`*`
`15`	`15`	`* @see SqmExpression#getNodeType`
`16`	`16`	`*`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,7 @@`
`55`	`55`	`import org.hibernate.query.spi.QueryParameterBindings;`
`56`	`56`	`import org.hibernate.query.spi.QueryParameterImplementor;`
`57`	`57`	`import org.hibernate.query.sqm.NodeBuilder;`
	`58`	`+import org.hibernate.query.sqm.SqmBindable;`
`58`	`59`	`import org.hibernate.query.sqm.SqmExpressible;`
`59`	`60`	`import org.hibernate.query.sqm.SqmPathSource;`
`60`	`61`	`import org.hibernate.query.sqm.SqmQuerySource;`
`@@ -1218,7 +1219,7 @@ private static <T> void verifySelectionType(`
`1218`	`1219`	`}`
`1219`	`1220`
`1220`	`1221`	`if ( !jpaCompliance.isJpaQueryComplianceEnabled() ) {`
`1221`		`- verifyResultType( expectedResultClass, selection.getExpressible() );`
	`1222`	`+ verifyResultType( expectedResultClass, selection );`
`1222`	`1223`	`}`
`1223`	`1224`	`}`
`1224`	`1225`
`@@ -1239,15 +1240,17 @@ public static boolean isResultTypeAlwaysAllowed(Class<?> expectedResultClass) {`
`1239`	`1240`	`\|\| expectedResultClass == Tuple.class;`
`1240`	`1241`	`}`
`1241`	`1242`
`1242`		`- protected static void verifyResultType(Class<?> resultClass, @Nullable SqmExpressible<?> selectionExpressible) {`
`1243`		`- if ( selectionExpressible != null ) {`
`1244`		`- final JavaType<?> javaType = selectionExpressible.getExpressibleJavaType();`
`1245`		`- if ( javaType != null ) {`
`1246`		`- final Class<?> javaTypeClass = javaType.getJavaTypeClass();`
`1247`		`- if ( javaTypeClass != Object.class ) {`
`1248`		`- if ( !isValid( resultClass, selectionExpressible, javaTypeClass, javaType ) ) {`
`1249`		`- throwQueryTypeMismatchException( resultClass, selectionExpressible );`
`1250`		`- }`
	`1243`	`+ protected static void verifyResultType(Class<?> resultClass, SqmSelectableNode<?> selectableNode) {`
	`1244`	`+ final SqmBindable<?> selectionExpressible = selectableNode.getExpressible();`
	`1245`	`+ final JavaType<?> javaType =`
	`1246`	`+ selectionExpressible == null`
	`1247`	`+ ? selectableNode.getNodeJavaType() // for SqmDynamicInstantiation`
	`1248`	`+ : selectionExpressible.getExpressibleJavaType();`
	`1249`	`+ if ( javaType != null ) {`
	`1250`	`+ final Class<?> javaTypeClass = javaType.getJavaTypeClass();`
	`1251`	`+ if ( javaTypeClass != Object.class ) {`
	`1252`	`+ if ( !isValid( resultClass, selectionExpressible, javaTypeClass, javaType ) ) {`
	`1253`	`+ throwQueryTypeMismatchException( resultClass, selectionExpressible, javaTypeClass );`
`1251`	`1254`	`}`
`1252`	`1255`	`}`
`1253`	`1256`	`}`
`@@ -1313,11 +1316,13 @@ private static boolean isMatchingDateJdbcType(Class<?> resultClass, JdbcType jdb`
`1313`	`1316`	`}`
`1314`	`1317`	`}`
`1315`	`1318`
`1316`		`- private static void throwQueryTypeMismatchException(Class<?> resultClass, SqmExpressible<?> sqmExpressible) {`
	`1319`	`+ private static void throwQueryTypeMismatchException(`
	`1320`	`+ Class<?> resultClass,`
	`1321`	`+ @Nullable SqmExpressible<?> sqmExpressible, @Nullable Class<?> javaTypeClass) {`
`1317`	`1322`	`throw new QueryTypeMismatchException( String.format(`
`1318`	`1323`	`Locale.ROOT,`
`1319`	`1324`	`"Incorrect query result type: query produces '%s' but type '%s' was given",`
`1320`		`- sqmExpressible.getTypeName(),`
	`1325`	`+ sqmExpressible == null ? javaTypeClass.getName() : sqmExpressible.getTypeName(),`
`1321`	`1326`	`resultClass.getName()`
`1322`	`1327`	`) );`
`1323`	`1328`	`}`