Skip to content

Commit ca321b3

Browse files
committed
[#2464] Skip query parameter processing
We used it to replace parameter markers for queries because Vert.x doesn't support the JDBC syntax and our own implementation of `ParameterMarkerStrategy` was not enough in the past. Now all tests pass even without the processing the query.
1 parent bf5c3b6 commit ca321b3

File tree

2 files changed

+2
-13
lines changed

2 files changed

+2
-13
lines changed

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
package org.hibernate.reactive.query.sql.internal;
77

8-
98
import java.util.ArrayList;
109
import java.util.Collections;
1110
import java.util.List;
@@ -20,7 +19,6 @@
2019
import org.hibernate.query.sql.spi.ParameterOccurrence;
2120
import org.hibernate.query.sqm.internal.SqmJdbcExecutionContextAdapter;
2221
import org.hibernate.reactive.engine.spi.ReactiveSharedSessionContractImplementor;
23-
import org.hibernate.reactive.pool.impl.Parameters;
2422
import org.hibernate.reactive.query.sql.spi.ReactiveNonSelectQueryPlan;
2523
import org.hibernate.reactive.sql.exec.internal.StandardReactiveJdbcMutationExecutor;
2624
import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl;
@@ -71,10 +69,8 @@ public CompletionStage<Integer> executeReactiveUpdate(DomainQueryExecutionContex
7169
}
7270

7371
final SQLQueryParser parser = new SQLQueryParser( sql, null, session.getFactory() );
74-
75-
Parameters parameters = Parameters.instance( session.getDialect() );
7672
final JdbcOperationQueryMutation jdbcMutation = new JdbcOperationQueryMutationNative(
77-
parameters.process( parser.process() ),
73+
parser.process(),
7874
jdbcParameterBinders,
7975
affectedTableNames
8076
);

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import org.hibernate.HibernateException;
1515
import org.hibernate.JDBCException;
1616
import org.hibernate.LockOptions;
17-
import org.hibernate.dialect.Dialect;
1817
import org.hibernate.engine.jdbc.spi.JdbcServices;
1918
import org.hibernate.engine.jdbc.spi.SqlStatementLogger;
2019
import org.hibernate.engine.spi.SessionEventListenerManager;
@@ -24,7 +23,6 @@
2423
import org.hibernate.reactive.logging.impl.Log;
2524
import org.hibernate.reactive.logging.impl.LoggerFactory;
2625
import org.hibernate.reactive.pool.ReactiveConnection;
27-
import org.hibernate.reactive.pool.impl.Parameters;
2826
import org.hibernate.reactive.session.ReactiveConnectionSupplier;
2927
import org.hibernate.reactive.session.ReactiveSession;
3028
import org.hibernate.reactive.util.impl.CompletionStages;
@@ -172,11 +170,6 @@ private CompletionStage<ResultSet> executeQuery() {
172170
return completedFuture( logicalConnection )
173171
.thenCompose( lg -> {
174172
LOG.tracef( "Executing query to retrieve ResultSet : %s", getFinalSql() );
175-
176-
Dialect dialect = executionContext.getSession().getJdbcServices().getDialect();
177-
// This must happen at the very last minute in order to process parameters
178-
// added in org.hibernate.dialect.pagination.OffsetFetchLimitHandler.processSql
179-
final String sql = Parameters.instance( dialect ).process( getFinalSql() );
180173
Object[] parameters = PreparedStatementAdaptor.bind( super::bindParameters );
181174

182175
final SessionEventListenerManager eventListenerManager = executionContext
@@ -186,7 +179,7 @@ private CompletionStage<ResultSet> executeQuery() {
186179

187180
eventListenerManager.jdbcExecuteStatementStart();
188181
return connection()
189-
.selectJdbc( sql, parameters )
182+
.selectJdbc( getFinalSql(), parameters )
190183
.thenCompose( this::validateResultSet )
191184
.whenComplete( (resultSet, throwable) -> {
192185
// FIXME: I don't know if this event makes sense for Vert.x

0 commit comments

Comments
 (0)