From 87ddf0e74bea3ee93137b4d581f68a022a9343da Mon Sep 17 00:00:00 2001
From: Nazarii Bardiuk <girafik.mail@gmail.com>
Date: Tue, 30 May 2017 01:13:31 +0100
Subject: [PATCH] HHH-11743 - Fix for streaming of Tuple query

---
 .../internal/ScrollableResultsIterator.java   |  7 ++--
 .../test/stream/basic/BasicStreamTest.java    | 35 +++++++++++++++++--
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/ScrollableResultsIterator.java b/hibernate-core/src/main/java/org/hibernate/query/internal/ScrollableResultsIterator.java
index e97f90efed..de10e2c7c3 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/internal/ScrollableResultsIterator.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/internal/ScrollableResultsIterator.java
@@ -36,11 +36,12 @@ class ScrollableResultsIterator<T> implements CloseableIterator {
 	@Override
 	@SuppressWarnings("unchecked")
 	public T next() {
-		if ( scrollableResults.getNumberOfTypes() == 1 ) {
-			return (T) scrollableResults.get()[0];
+		Object[] next = scrollableResults.get();
+		if ( next.length == 1 ) {
+			return (T) next[0];
 		}
 		else {
-			return (T) scrollableResults.get();
+			return (T) next;
 		}
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/test/stream/basic/BasicStreamTest.java b/hibernate-core/src/test/java/org/hibernate/test/stream/basic/BasicStreamTest.java
index 78d541c8f1..a06e537501 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/stream/basic/BasicStreamTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/stream/basic/BasicStreamTest.java
@@ -6,17 +6,19 @@
  */
 package org.hibernate.test.stream.basic;
 
-import java.util.Optional;
 import java.util.stream.Stream;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
+import javax.persistence.Tuple;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Root;
 
 import org.hibernate.Session;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.engine.spi.SessionImplementor;
 
-import org.hibernate.query.Query;
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase;
 import org.junit.Test;
@@ -24,7 +26,7 @@ import org.junit.Test;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hibernate.testing.junit4.ExtraAssertions.assertTyping;
-import static org.junit.Assert.assertNotNull;
+import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate;
 
 /**
  * @author Steve Ebersole
@@ -94,6 +96,33 @@ public class BasicStreamTest extends BaseNonConfigCoreFunctionalTestCase {
 		}
 	}
 
+	@Test
+	@TestForIssue(jiraKey = "HHH-11743")
+	public void testTupleStream() {
+		doInHibernate( this::sessionFactory, session -> {
+			MyEntity entity = new MyEntity();
+			entity.id = 2;
+			entity.name = "an entity";
+			session.persist( entity );
+		} );
+
+		//test tuple stream using criteria
+		doInHibernate( this::sessionFactory, session -> {
+			CriteriaBuilder cb = session.getCriteriaBuilder();
+			CriteriaQuery<Tuple> criteria = cb.createTupleQuery();
+			Root<MyEntity> me = criteria.from( MyEntity.class );
+			criteria.multiselect( me.get( "id" ), me.get( "name" ) );
+			Stream<Tuple> data = session.createQuery( criteria ).stream();
+			data.forEach( tuple -> assertTyping( Tuple.class, tuple ) );
+		} );
+
+		//test tuple stream using JPQL
+		doInHibernate( this::sessionFactory, session -> {
+			Stream<Tuple> data = session.createQuery( "SELECT me.id, me.name FROM MyEntity me", Tuple.class ).stream();
+			data.forEach( tuple -> assertTyping( Tuple.class, tuple ) );
+		} );
+	}
+
 	@Entity(name = "MyEntity")
 	@Table(name="MyEntity")
 	public static class MyEntity {