fix

Author: DavideD

hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sql/internal/ReactiveNativeQueryImpl.java

@@ -33,19 +33,22 @@
 import org.hibernate.query.QueryParameter;
 import org.hibernate.query.ResultListTransformer;
 import org.hibernate.query.TupleTransformer;
+import org.hibernate.query.internal.DelegatingDomainQueryExecutionContext;
 import org.hibernate.query.named.NamedResultSetMappingMemento;
 import org.hibernate.query.spi.AbstractSelectionQuery;
 import org.hibernate.query.spi.NonSelectQueryPlan;
 import org.hibernate.query.spi.QueryInterpretationCache;
+import org.hibernate.query.spi.QueryOptions;
 import org.hibernate.query.sql.internal.NativeQueryImpl;
 import org.hibernate.query.sql.spi.NamedNativeQueryMemento;
-import org.hibernate.query.sql.spi.NativeSelectQueryPlan;
 import org.hibernate.reactive.logging.impl.Log;
 import org.hibernate.reactive.logging.impl.LoggerFactory;
 import org.hibernate.reactive.query.spi.ReactiveAbstractSelectionQuery;
+import org.hibernate.reactive.query.spi.ReactiveNativeSelectQueryPlan;
 import org.hibernate.reactive.query.sql.spi.ReactiveNativeQueryImplementor;
 import org.hibernate.reactive.query.sql.spi.ReactiveNonSelectQueryPlan;
 import org.hibernate.reactive.query.sqm.spi.ReactiveSelectQueryPlan;
+import org.hibernate.reactive.sql.results.spi.ReactiveSingleResultConsumer;
 import org.hibernate.type.BasicTypeReference;
 
 import jakarta.persistence.AttributeConverter;
@@ -190,14 +193,19 @@ public List<R> list() {
 
 	@Override
 	public CompletionStage<Long> getReactiveResultsCount() {
-		NativeSelectQueryPlan<Long> countQueryPlan = createCountQueryPlan();
-		return selectionQueryDelegate
-				.getReactiveResultsCount(null,  this );
+		final DelegatingDomainQueryExecutionContext context = new DelegatingDomainQueryExecutionContext( this ) {
+			@Override
+			public QueryOptions getQueryOptions() {
+				return QueryOptions.NONE;
+			}
+		};
+
+		return createCountQueryPlan().reactiveExecuteQuery( context, new ReactiveSingleResultConsumer<>() );
 	}
 
 	@Override
-	protected NativeSelectQueryPlan<Long> createCountQueryPlan() {
-		return super.createCountQueryPlan();
+	protected ReactiveNativeSelectQueryPlan<Long> createCountQueryPlan() {
+		return (ReactiveNativeSelectQueryPlan<Long>) super.createCountQueryPlan();
 	}
 
 	@Override

hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sql/internal/ReactiveNativeSelectQueryPlanImpl.java

@@ -27,6 +27,7 @@
 import org.hibernate.reactive.query.spi.ReactiveNativeSelectQueryPlan;
 import org.hibernate.reactive.sql.exec.internal.StandardReactiveSelectExecutor;
 import org.hibernate.reactive.sql.results.spi.ReactiveListResultsConsumer;
+import org.hibernate.reactive.sql.results.spi.ReactiveResultsConsumer;
 import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl;
 import org.hibernate.sql.exec.spi.JdbcOperationQuerySelect;
 import org.hibernate.sql.exec.spi.JdbcParameterBinder;
@@ -65,6 +66,55 @@ public ReactiveNativeSelectQueryPlanImpl(
 
 	}
 
+	@Override
+	public <T> CompletionStage<T> reactiveExecuteQuery(DomainQueryExecutionContext executionContext, ReactiveResultsConsumer<T, R> resultsConsumer) {
+		final List<JdbcParameterBinder> jdbcParameterBinders;
+		final JdbcParameterBindings jdbcParameterBindings;
+
+		final QueryParameterBindings queryParameterBindings = executionContext.getQueryParameterBindings();
+		if ( parameterList == null || parameterList.isEmpty() ) {
+			jdbcParameterBinders = emptyList();
+			jdbcParameterBindings = JdbcParameterBindings.NO_BINDINGS;
+		}
+		else {
+			jdbcParameterBinders = new ArrayList<>( parameterList.size() );
+			jdbcParameterBindings = new JdbcParameterBindingsImpl(
+					queryParameterBindings,
+					parameterList,
+					jdbcParameterBinders,
+					executionContext.getSession().getFactory()
+			);
+		}
+
+		final ReactiveSharedSessionContractImplementor reactiveSession = (ReactiveSharedSessionContractImplementor) executionContext.getSession();
+		return reactiveSession
+				.reactiveAutoFlushIfRequired( affectedTableNames )
+				.thenCompose( aBoolean -> {
+					final JdbcOperationQuerySelect jdbcSelect = new JdbcOperationQuerySelect(
+							sql,
+							jdbcParameterBinders,
+							resultSetMapping,
+							affectedTableNames,
+							Collections.emptySet()
+					);
+
+					return StandardReactiveSelectExecutor.INSTANCE
+							.executeQuery(
+									jdbcSelect,
+									jdbcParameterBindings,
+									SqmJdbcExecutionContextAdapter.usingLockingAndPaging( executionContext ),
+									null,
+									null,
+									sqlString -> executionContext.getSession()
+											.getJdbcCoordinator()
+											.getStatementPreparer()
+											.prepareQueryStatement( sqlString, false, null ),
+									resultsConsumer
+							);
+
+				} );
+	}
+
 	@Override
 	public CompletionStage<List<R>> reactivePerformList(DomainQueryExecutionContext executionContext) {
 		final QueryOptions queryOptions = executionContext.getQueryOptions();