[#2314] Fix '?' parameters in limit/offset not being replaced with native equivalent when using PostgreSQL/MSSQL

Reverts changes introduced in e257189,
probably assuming this was more efficient and didn't break anything
(understandably, considering tests did pass).

Author: yrodiere

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

@@ -20,7 +20,6 @@
 import org.hibernate.query.sql.spi.ParameterOccurrence;
 import org.hibernate.query.sqm.internal.SqmJdbcExecutionContextAdapter;
 import org.hibernate.reactive.engine.spi.ReactiveSharedSessionContractImplementor;
-import org.hibernate.reactive.pool.impl.Parameters;
 import org.hibernate.reactive.query.sql.spi.ReactiveNonSelectQueryPlan;
 import org.hibernate.reactive.sql.exec.internal.StandardReactiveJdbcMutationExecutor;
 import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl;
@@ -72,9 +71,8 @@ public CompletionStage<Integer> executeReactiveUpdate(DomainQueryExecutionContex
 
 							final SQLQueryParser parser = new SQLQueryParser( sql, null, session.getFactory() );
 
-							Parameters parameters = Parameters.instance( session.getDialect() );
 							final JdbcOperationQueryMutation jdbcMutation = new JdbcOperationQueryMutationNative(
-									parameters.process( parser.process() ),
+									parser.process(),
 									jdbcParameterBinders,
 									affectedTableNames
 							);

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

@@ -11,7 +11,6 @@
 import java.util.Set;
 import java.util.concurrent.CompletionStage;
 
-import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.query.results.ResultSetMapping;
 import org.hibernate.query.spi.DomainQueryExecutionContext;
@@ -23,7 +22,6 @@
 import org.hibernate.query.sql.spi.ParameterOccurrence;
 import org.hibernate.query.sqm.internal.SqmJdbcExecutionContextAdapter;
 import org.hibernate.reactive.engine.spi.ReactiveSharedSessionContractImplementor;
-import org.hibernate.reactive.pool.impl.Parameters;
 import org.hibernate.reactive.query.internal.ReactiveResultSetMappingProcessor;
 import org.hibernate.reactive.query.spi.ReactiveNativeSelectQueryPlan;
 import org.hibernate.reactive.sql.exec.internal.StandardReactiveSelectExecutor;
@@ -61,8 +59,7 @@ public ReactiveNativeSelectQueryPlanImpl(
 			resultSetMapping.addAffectedTableNames( affectedTableNames, sessionFactory );
 		}
 		this.affectedTableNames = affectedTableNames;
-		Dialect dialect = sessionFactory.getJdbcServices().getDialect();
-		this.sql = Parameters.instance( dialect ).process( parser.process() );
+		this.sql = parser.process();
 		this.parameterList = parameterList;
 
 	}

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

@@ -14,6 +14,7 @@
 
 import org.hibernate.HibernateException;
 import org.hibernate.LockOptions;
+import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.jdbc.spi.SqlStatementLogger;
 import org.hibernate.engine.spi.SessionEventListenerManager;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
@@ -22,6 +23,7 @@
 import org.hibernate.reactive.logging.impl.Log;
 import org.hibernate.reactive.logging.impl.LoggerFactory;
 import org.hibernate.reactive.pool.ReactiveConnection;
+import org.hibernate.reactive.pool.impl.Parameters;
 import org.hibernate.reactive.session.ReactiveConnectionSupplier;
 import org.hibernate.reactive.session.ReactiveSession;
 import org.hibernate.reactive.util.impl.CompletionStages;
@@ -172,6 +174,11 @@ private CompletionStage<ResultSet> executeQuery() {
 		return completedFuture( logicalConnection )
 				.thenCompose( lg -> {
 					LOG.tracef( "Executing query to retrieve ResultSet : %s", getFinalSql() );
+
+					Dialect dialect = executionContext.getSession().getJdbcServices().getDialect();
+					// This must happen at the very last minute in order to process parameters
+					// added in org.hibernate.dialect.pagination.OffsetFetchLimitHandler.processSql
+					final String sql = Parameters.instance( dialect ).process( getFinalSql() );
 					Object[] parameters = PreparedStatementAdaptor.bind( super::bindParameters );
 
 					final SessionEventListenerManager eventListenerManager = executionContext
@@ -181,7 +188,7 @@ private CompletionStage<ResultSet> executeQuery() {
 
 					eventListenerManager.jdbcExecuteStatementStart();
 					return connection()
-							.selectJdbc( getFinalSql(), parameters )
+							.selectJdbc( sql, parameters )
 							.thenCompose( this::validateResultSet )
 							.whenComplete( (resultSet, throwable) -> {
 								// FIXME: I don't know if this event makes sense for Vert.x