Hibernate/hibernate-orm
1
0
Fork 0
mirror of https://github.com/hibernate/hibernate-orm synced 2025-02-13 06:34:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

HHH-18007 Use correct expressible when checking query result type

Browse Source
This commit is contained in:
Marco Belladelli 2024-05-02 09:52:43 +02:00 committed by Christian Beikov
parent e036509487
commit 758a660bca
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-core/src/main/java/org/hibernate/query/spi/AbstractSelectionQuery.java
View File

@ -317,7 +317,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!

2
hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmBasicValuedSimplePath.java
View File

@ -175,7 +175,7 @@ public Class<T> getJavaType() {
@Override
public JavaType<T> getExpressibleJavaType() {
return getJavaTypeDescriptor();
return super.getExpressible().getExpressibleJavaType();
}
@Override

2
hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmEmbeddedValuedSimplePath.java
View File

@ -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

5
hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmAliasedNode.java
View File

@ -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();
}
}