Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-17393 Check single selection type for list row transformer

This commit is contained in:
Marco Belladelli 2023-11-28 11:11:46 +01:00
parent cd0985ade9
commit 4e73ffca20
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hibernate-core/src/main/java/org/hibernate/query/sqm/internal/ConcreteSqmSelectQueryPlan.java
View File

@ -195,6 +195,20 @@ public class ConcreteSqmSelectQueryPlan<R> implements SelectQueryPlan<R> {
return new MySqmJdbcExecutionContextAdapter( executionContext, jdbcSelect, subSelectFetchKeyHandler, hql );
}
private static Class<?> singleSelectionType(SqmSelectStatement<?> sqm) {
final List<SqmSelection<?>> selections = sqm.getQueryPart()
.getFirstQuerySpec()
.getSelectClause()
.getSelections();
if ( selections.size() == 1 ) {
final SqmSelection<?> sqmSelection = selections.get( 0 );
return sqmSelection.getSelectableNode().isCompoundSelection() ?
null :
sqmSelection.getNodeJavaType().getJavaTypeClass();
}
return null;
}
@SuppressWarnings("unchecked")
protected static <T> RowTransformer<T> determineRowTransformer(
SqmSelectStatement<?> sqm,
@ -210,13 +224,13 @@ public class ConcreteSqmSelectQueryPlan<R> implements SelectQueryPlan<R> {
else if ( resultType == Object[].class ) {
return (RowTransformer<T>) RowTransformerArrayImpl.instance();
}
else if ( resultType == List.class ) {
else if ( resultType == List.class && resultType != singleSelectionType( sqm ) ) {
return (RowTransformer<T>) RowTransformerListImpl.instance();
}
else {
// NOTE : if we get here :
// 1) there is no TupleTransformer specified
// 2) an explicit result-type, other than an array, was specified
// 2) an explicit result-type, other than an array or List, was specified
if ( tupleMetadata == null ) {
if ( sqm.getQueryPart().getFirstQuerySpec().getSelectClause().getSelections().size() == 1 ) {