fix #919 native queries returning Tuple

Author: gavinking

hibernate-reactive-core/src/main/java/org/hibernate/reactive/mutiny/impl/MutinySessionImpl.java

@@ -207,11 +207,7 @@ public <R> Mutiny.Query<R> createNativeQuery(String sql) {
 
 	@Override
 	public <R> Mutiny.Query<R> createNativeQuery(String sql, Class<R> resultType) {
-		boolean knownType = delegate.getFactory().getMetamodel()
-				.entityPersisters().containsKey( resultType.getName() );
-		return knownType
-				? new MutinyQueryImpl<>( delegate.createReactiveNativeQuery(sql, resultType), factory )
-				: new MutinyQueryImpl<>( delegate.createReactiveNativeQuery(sql), factory );
+		return new MutinyQueryImpl<>( delegate.createReactiveNativeQuery(sql, resultType), factory );
 	}
 
 	@Override

hibernate-reactive-core/src/main/java/org/hibernate/reactive/mutiny/impl/MutinyStatelessSessionImpl.java

@@ -74,11 +74,7 @@ public <R> Mutiny.Query<R> createNativeQuery(String queryString) {
 
     @Override
     public <R> Mutiny.Query<R> createNativeQuery(String queryString, Class<R> resultType) {
-        boolean knownType = delegate.getFactory().getMetamodel()
-                .entityPersisters().containsKey( resultType.getName() );
-        return knownType
-                ? new MutinyQueryImpl<>( delegate.createReactiveNativeQuery(queryString, resultType), factory )
-                : new MutinyQueryImpl<>( delegate.createReactiveNativeQuery(queryString), factory );
+        return new MutinyQueryImpl<>( delegate.createReactiveNativeQuery(queryString, resultType), factory );
     }
 
     @Override

hibernate-reactive-core/src/main/java/org/hibernate/reactive/session/impl/ReactiveSessionImpl.java

@@ -316,23 +316,19 @@ public <T> ResultSetMapping<T> getResultSetMapping(Class<T> resultType, String m
 	public <T> ReactiveQuery<T> createReactiveNativeQuery(String sqlString, Class<T> resultClass) {
 		try {
 			ReactiveNativeQuery<T> query = createReactiveNativeQuery( sqlString );
-			handleNativeQueryResult( query, resultClass );
+			if ( getMetamodel().entityPersisters().containsKey( resultClass.getName() ) ) {
+				query.addEntity( "alias1", resultClass.getName(), LockMode.READ );
+			}
+			else if ( Tuple.class.equals(resultClass) ) {
+				query.setResultTransformer( new NativeQueryTupleTransformer() );
+			}
 			return query;
 		}
 		catch ( RuntimeException he ) {
 			throw getExceptionConverter().convert( he );
 		}
 	}
 
-	private <T> void handleNativeQueryResult(ReactiveNativeQuery<T> query, Class<T> resultClass) {
-		if ( Tuple.class.equals( resultClass ) ) {
-			query.setResultTransformer( new NativeQueryTupleTransformer() );
-		}
-		else {
-			query.addEntity( "alias1", resultClass.getName(), LockMode.READ );
-		}
-	}
-
 	@Override
 	public <R> ReactiveQueryImpl<R> createReactiveQuery(String queryString) {
 		checkOpen();

hibernate-reactive-core/src/main/java/org/hibernate/reactive/session/impl/ReactiveStatelessSessionImpl.java

@@ -33,6 +33,7 @@
 import org.hibernate.jpa.spi.NativeQueryTupleTransformer;
 import org.hibernate.loader.custom.CustomQuery;
 import org.hibernate.loader.custom.sql.SQLCustomQuery;
+import org.hibernate.metamodel.spi.MetamodelImplementor;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.proxy.HibernateProxy;
 import org.hibernate.proxy.LazyInitializer;
@@ -343,15 +344,6 @@ public <R> ReactiveQuery<R> createReactiveQuery(String queryString, Class<R> res
         }
     }
 
-    private <T> void handleNativeQueryResult(ReactiveNativeQuery<T> query, Class<T> resultClass) {
-        if ( Tuple.class.equals( resultClass ) ) {
-            query.setResultTransformer( new NativeQueryTupleTransformer() );
-        }
-        else {
-            query.addEntity( "alias1", resultClass.getName(), LockMode.READ );
-        }
-    }
-
     @Override
     public <R> ReactiveQuery<R> createReactiveNamedQuery(String name) {
         return buildReactiveQueryFromName( name, null );
@@ -468,11 +460,21 @@ public <T> ReactiveNativeQuery<T> createReactiveNativeQuery(String sqlString) {
         }
     }
 
+    public MetamodelImplementor getMetamodel() {
+        checkOpen();
+        return getFactory().getMetamodel();
+    }
+
     @Override
     public <T> ReactiveNativeQuery<T> createReactiveNativeQuery(String sqlString, Class<T> resultClass) {
         try {
             ReactiveNativeQuery<T> query = createReactiveNativeQuery( sqlString );
-            handleNativeQueryResult( query, resultClass );
+            if ( getMetamodel().entityPersisters().containsKey( resultClass.getName() ) ) {
+                query.addEntity( "alias1", resultClass.getName(), LockMode.READ );
+            }
+            else if ( Tuple.class.equals(resultClass) ) {
+                query.setResultTransformer( new NativeQueryTupleTransformer() );
+            }
             return query;
         }
         catch ( RuntimeException he ) {

hibernate-reactive-core/src/main/java/org/hibernate/reactive/stage/impl/StageSessionImpl.java

@@ -206,11 +206,7 @@ public <R> Stage.Query<R> createNativeQuery(String sql) {
 
 	@Override
 	public <R> Stage.Query<R> createNativeQuery(String sql, Class<R> resultType) {
-		boolean knownType = delegate.getFactory().getMetamodel()
-				.entityPersisters().containsKey( resultType.getName() );
-		return knownType
-				? new StageQueryImpl<>( delegate.createReactiveNativeQuery(sql, resultType), factory )
-				: new StageQueryImpl<>( delegate.createReactiveNativeQuery(sql), factory );
+		return new StageQueryImpl<>( delegate.createReactiveNativeQuery(sql, resultType), factory );
 	}
 
 	@Override

hibernate-reactive-core/src/main/java/org/hibernate/reactive/stage/impl/StageStatelessSessionImpl.java

@@ -75,11 +75,7 @@ public <R> Stage.Query<R> createNativeQuery(String queryString) {
 
     @Override
     public <R> Stage.Query<R> createNativeQuery(String queryString, Class<R> resultType) {
-        boolean knownType = delegate.getFactory().getMetamodel()
-                .entityPersisters().containsKey( resultType.getName() );
-        return knownType
-                ? new StageQueryImpl<>( delegate.createReactiveNativeQuery(queryString, resultType), factory )
-                : new StageQueryImpl<>( delegate.createReactiveNativeQuery(queryString), factory );
+        return new StageQueryImpl<>( delegate.createReactiveNativeQuery(queryString, resultType), factory );
     }
 
     @Override

hibernate-reactive-core/src/test/java/org/hibernate/reactive/QueryTest.java

@@ -427,6 +427,15 @@ public void testNativeProjectionQuery(TestContext context) {
 													context.assertTrue( tuple[0] instanceof String );
 												} )
 										)
+										.thenCompose( vv -> session.createNativeQuery("select title, isbn, id from books", Tuple.class )
+												.getResultList()
+												.thenAccept( list -> {
+													Tuple tuple = list.get(0);
+													context.assertEquals( 3, tuple.toArray().length );
+													context.assertTrue( tuple.get(0) instanceof String );
+													context.assertTrue( tuple.get("isbn") instanceof String );
+												} )
+										)
 								)
 		);
 	}