HHH-10664 - Prep 6.0 feature branch - merge hibernate-entitymanager into hibernate-core (continued fixing of hibernate-core test failures)

Author: sebersole

hibernate-core/src/main/java/org/hibernate/query/internal/AbstractProducedQuery.java

@@ -1002,20 +1002,24 @@ protected void afterQuery() {
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public Iterator<R> iterate() {
 		beforeQuery();
 		try {
-			return getProducer().iterate(
-					queryParameterBindings.expandListValuedParameters( getQueryString(), getProducer() ),
-					getQueryParameters()
-			);
+			return doIterate();
 		}
 		finally {
 			afterQuery();
 		}
 	}
 
+	@SuppressWarnings("unchecked")
+	protected Iterator<R> doIterate() {
+		return getProducer().iterate(
+				queryParameterBindings.expandListValuedParameters( getQueryString(), getProducer() ),
+				getQueryParameters()
+		);
+	}
+
 	@Override
 	public ScrollableResults scroll() {
 		return scroll( getProducer().getJdbcServices().getJdbcEnvironment().getDialect().defaultScrollMode() );
@@ -1025,18 +1029,22 @@ public ScrollableResults scroll() {
 	public ScrollableResults scroll(ScrollMode scrollMode) {
 		beforeQuery();
 		try {
-			QueryParameters queryParameters = getQueryParameters();
-			queryParameters.setScrollMode( scrollMode );
-			return getProducer().scroll(
-					queryParameterBindings.expandListValuedParameters( getQueryString(), getProducer() ),
-					queryParameters
-			);
+			return doScroll( scrollMode );
 		}
 		finally {
 			afterQuery();
 		}
 	}
 
+	protected ScrollableResults doScroll(ScrollMode scrollMode) {
+		QueryParameters queryParameters = getQueryParameters();
+		queryParameters.setScrollMode( scrollMode );
+		return getProducer().scroll(
+				queryParameterBindings.expandListValuedParameters( getQueryString(), getProducer() ),
+				queryParameters
+		);
+	}
+
 	@Override
 	public List<R> list() {
 		beforeQuery();

hibernate-core/src/main/java/org/hibernate/query/internal/NativeQueryImpl.java

@@ -25,6 +25,8 @@
 import org.hibernate.LockOptions;
 import org.hibernate.MappingException;
 import org.hibernate.QueryException;
+import org.hibernate.ScrollMode;
+import org.hibernate.ScrollableResults;
 import org.hibernate.engine.ResultSetMappingDefinition;
 import org.hibernate.engine.query.spi.sql.NativeSQLQueryConstructorReturn;
 import org.hibernate.engine.query.spi.sql.NativeSQLQueryReturn;
@@ -178,6 +180,14 @@ private void prepareQueryReturnsIfNecessary() {
 		}
 	}
 
+	@Override
+	protected ScrollableResults doScroll(ScrollMode scrollMode) {
+		return getProducer().scroll(
+				generateQuerySpecification(),
+				getQueryParameters()
+		);
+	}
+
 	@Override
 	protected void beforeQuery() {
 		prepareQueryReturnsIfNecessary();