HHH-18218 - Improved type resolving when tuple element implements SqmExpressibleAccessor

Author: cigaly

hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerConstructorImpl.java

@@ -14,6 +14,9 @@
 import java.lang.reflect.Constructor;
 import java.util.List;
 
+import org.hibernate.query.sqm.SqmExpressible;
+import org.hibernate.query.sqm.tree.SqmExpressibleAccessor;
+
 /**
  * {@link RowTransformer} instantiating an arbitrary class
  *
@@ -30,7 +33,7 @@ public RowTransformerConstructorImpl(Class<T> type, TupleMetadata tupleMetadata)
 		final List<TupleElement<?>> elements = tupleMetadata.getList();
 		final Class<?>[] sig = new Class[elements.size()];
 		for (int i = 0; i < elements.size(); i++) {
-			sig[i] = elements.get(i).getJavaType();
+			sig[i] = resolveElementJavaType( elements.get( i ) );
 		}
 		try {
 			constructor = type.getDeclaredConstructor( sig );
@@ -42,6 +45,17 @@ public RowTransformerConstructorImpl(Class<T> type, TupleMetadata tupleMetadata)
 		}
 	}
 
+	private static Class<?> resolveElementJavaType(TupleElement<?> element) {
+		if ( element instanceof SqmExpressibleAccessor ) {
+			SqmExpressible expressible = ( (SqmExpressibleAccessor) element ).getExpressible();
+			if ( expressible != null ) {
+				return expressible.getExpressibleJavaType().getJavaTypeClass();
+			}
+		}
+
+		return element.getJavaType();
+	}
+
 	@Override
 	public T transformRow(Object[] row) {
 		try {