HHH-18007 Use correct expressible when checking query result type

hibernate · Jun 11, 2024 · 1919409 · 1919409
1 parent 433fbe9
commit 1919409
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/AbstractSelectionQuery.java b/hibernate-core/src/main/java/org/hibernate/query/spi/AbstractSelectionQuery.java
@@ -315,7 +315,7 @@ protected static <T> void checkQueryReturnType(
 				}
 
 				if ( !sessionFactory.getSessionFactoryOptions().getJpaCompliance().isJpaQueryComplianceEnabled() ) {
-					verifyResultType( expectedResultClass, sqmSelection.getNodeType() );
+					verifyResultType( expectedResultClass, sqmSelection.getExpressible() );
 				}
 			}
 			// else, let's assume we can instantiate it!

diff --git a/...nate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmBasicValuedSimplePath.java b/...nate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmBasicValuedSimplePath.java
@@ -122,7 +122,7 @@ public Class<T> getJavaType() {
 
 	@Override
 	public JavaType<T> getExpressibleJavaType() {
-		return getJavaTypeDescriptor();
+		return super.getExpressible().getExpressibleJavaType();
 	}
 
 	@Override

diff --git a/...e-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmEmbeddedValuedSimplePath.java b/...e-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmEmbeddedValuedSimplePath.java
@@ -109,7 +109,7 @@ public <S extends T> SqmTreatedPath<T, S> treatAs(EntityDomainType<S> treatTarge
 
 	@Override
 	public JavaType<T> getExpressibleJavaType() {
-		return getJavaTypeDescriptor();
+		return super.getExpressible().getExpressibleJavaType();
 	}
 
 	@Override

diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmAliasedNode.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmAliasedNode.java
@@ -30,4 +30,9 @@ public interface SqmAliasedNode<T> extends SqmTypedNode<T> {
 	default SqmExpressible<T> getNodeType() {
 		return getSelectableNode().getNodeType();
 	}
+
+	@Override
+	default SqmExpressible<T> getExpressible() {
+		return getSelectableNode().getExpressible();
+	}
 }