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

HHH-16119 Named native queries do not work with jakarta.persistence.Tuple result class

This commit is contained in:
Andrea Boriero 2023-02-09 12:13:40 +01:00 committed by Christian Beikov
parent 41961d457a
commit 50b835b145
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hibernate-core/src/main/java/org/hibernate/jpa/spi/NativeQueryTupleTransformer.java
View File

@ -60,6 +60,8 @@ public class NativeQueryTupleTransformer implements ResultTransformer<Tuple>, Ty
private final Object[] tuple; private final Object[] tuple;
private final int size;
private final Map<String, Object> aliasToValue = new LinkedHashMap<>(); private final Map<String, Object> aliasToValue = new LinkedHashMap<>();
private final Map<String, String> aliasReferences = new LinkedHashMap<>(); private final Map<String, String> aliasReferences = new LinkedHashMap<>();
@ -75,9 +77,13 @@ public class NativeQueryTupleTransformer implements ResultTransformer<Tuple>, Ty
} }
this.tuple = tuple; this.tuple = tuple;
for ( int i = 0; i < tuple.length; i++ ) { for ( int i = 0; i < tuple.length; i++ ) {
aliasToValue.put( aliases[i], tuple[i] ); final String alias = aliases[i];
aliasReferences.put( aliases[i].toLowerCase(), aliases[i] ); if ( alias != null ) {
aliasToValue.put( alias, tuple[i] );
aliasReferences.put( alias.toLowerCase(), alias );
}
} }
size = tuple.length;
} }
@Override @Override
@ -108,7 +114,7 @@ public class NativeQueryTupleTransformer implements ResultTransformer<Tuple>, Ty
if ( i < 0 ) { if ( i < 0 ) {
throw new IllegalArgumentException( "requested tuple index must be greater than zero" ); throw new IllegalArgumentException( "requested tuple index must be greater than zero" );
} }
if ( i >= aliasToValue.size() ) { if ( i >= size ) {
throw new IllegalArgumentException( "requested tuple index exceeds actual tuple size" ); throw new IllegalArgumentException( "requested tuple index exceeds actual tuple size" );
} }
return tuple[i]; return tuple[i];
@ -122,7 +128,7 @@ public class NativeQueryTupleTransformer implements ResultTransformer<Tuple>, Ty
@Override @Override
public List<TupleElement<?>> getElements() { public List<TupleElement<?>> getElements() {
List<TupleElement<?>> elements = new ArrayList<>( aliasToValue.size() ); List<TupleElement<?>> elements = new ArrayList<>( size );
for ( Map.Entry<String, Object> entry : aliasToValue.entrySet() ) { for ( Map.Entry<String, Object> entry : aliasToValue.entrySet() ) {
elements.add( new NativeTupleElementImpl<>( getValueClass( entry.getValue() ), entry.getKey() ) ); elements.add( new NativeTupleElementImpl<>( getValueClass( entry.getValue() ), entry.getKey() ) );