HHH-16283 - improve in minor ways

Author: nathan.xu

hibernate-core/src/main/java/org/hibernate/dialect/pagination/LimitHandler.java

@@ -8,6 +8,7 @@
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
+import java.util.function.Supplier;
 
 import org.hibernate.query.spi.Limit;
 import org.hibernate.query.spi.QueryOptions;
@@ -48,7 +49,7 @@ default String processSql(String sql, Limit limit, QueryOptions queryOptions) {
 		return processSql( sql, limit );
 	}
 
-	default String processSql(String sql, Limit limit, QueryOptions queryOptions, ParameterMarkerStrategy parameterMarkerStrategy, int limitParameterStartPosition) {
+	default String processSql(String sql, Limit limit, QueryOptions queryOptions, Supplier<String> parameterMarkerSupplier) {
 		return processSql( sql, limit, queryOptions );
 	}
 

hibernate-core/src/main/java/org/hibernate/dialect/pagination/OffsetFetchLimitHandler.java

@@ -6,11 +6,10 @@
  */
 package org.hibernate.dialect.pagination;
 
+import java.util.function.Supplier;
+
 import org.hibernate.query.spi.Limit;
 import org.hibernate.query.spi.QueryOptions;
-import org.hibernate.sql.ast.internal.ParameterMarkerStrategyStandard;
-import org.hibernate.sql.ast.spi.ParameterMarkerStrategy;
-import org.hibernate.type.descriptor.jdbc.IntegerJdbcType;
 
 /**
  * A {@link LimitHandler} for databases which support the
@@ -31,11 +30,11 @@ public OffsetFetchLimitHandler(boolean variableLimit) {
 
 	@Override
 	public String processSql(String sql, Limit limit) {
-		return processSql( sql, limit, null, ParameterMarkerStrategyStandard.INSTANCE, 1 );
+		return processSql( sql, limit, null, () -> "?" );
 	}
 
 	@Override
-	public String processSql(String sql, Limit limit, QueryOptions queryOptions, ParameterMarkerStrategy parameterMarkerStrategy, int limitParameterStartPosition) {
+	public String processSql(String sql, Limit limit, QueryOptions queryOptions, Supplier<String> parameterMarkerSupplier) {
 
 		boolean hasFirstRow = hasFirstRow(limit);
 		boolean hasMaxRows = hasMaxRows(limit);
@@ -51,7 +50,7 @@ public String processSql(String sql, Limit limit, QueryOptions queryOptions, Par
 		if ( hasFirstRow ) {
 			offsetFetch.append( " offset " );
 			if ( supportsVariableLimit() ) {
-				offsetFetch.append( parameterMarkerStrategy.createMarker( limitParameterStartPosition++, IntegerJdbcType.INSTANCE ) );
+				offsetFetch.append( parameterMarkerSupplier.get() );
 			}
 			else {
 				offsetFetch.append( limit.getFirstRow() );
@@ -69,7 +68,7 @@ public String processSql(String sql, Limit limit, QueryOptions queryOptions, Par
 				offsetFetch.append( " fetch first " );
 			}
 			if ( supportsVariableLimit() ) {
-				offsetFetch.append( parameterMarkerStrategy.createMarker( limitParameterStartPosition++, IntegerJdbcType.INSTANCE ) );
+				offsetFetch.append( parameterMarkerSupplier.get() );
 			}
 			else {
 				offsetFetch.append( getMaxOrLimit( limit ) );

hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/DeferredResultSetAccess.java

@@ -10,7 +10,6 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Collections;
-import java.util.function.Function;
 
 import org.hibernate.LockMode;
 import org.hibernate.LockOptions;
@@ -25,6 +24,7 @@
 import org.hibernate.event.spi.HibernateMonitoringEvent;
 import org.hibernate.internal.CoreLogging;
 import org.hibernate.internal.CoreMessageLogger;
+import org.hibernate.internal.util.MutableInteger;
 import org.hibernate.query.spi.Limit;
 import org.hibernate.query.spi.QueryOptions;
 import org.hibernate.resource.jdbc.spi.JdbcSessionContext;
@@ -55,6 +55,7 @@ public class DeferredResultSetAccess extends AbstractResultSetAccess {
 	private final LimitHandler limitHandler;
 	private final boolean usesFollowOnLocking;
 	private final int resultCountEstimate;
+	private final ParameterMarkerStrategy parameterMarkerStrategy;
 
 	private PreparedStatement preparedStatement;
 	private ResultSet resultSet;
@@ -72,6 +73,7 @@ public DeferredResultSetAccess(
 		this.statementCreator = statementCreator;
 		this.sqlStatementLogger = executionContext.getSession().getJdbcServices().getSqlStatementLogger();
 		this.resultCountEstimate = resultCountEstimate;
+		this.parameterMarkerStrategy = executionContext.getSession().getSessionFactory().getServiceRegistry().requireService( ParameterMarkerStrategy.class );
 
 		final QueryOptions queryOptions = executionContext.getQueryOptions();
 		if ( queryOptions == null ) {
@@ -92,13 +94,12 @@ public DeferredResultSetAccess(
 			}
 			else {
 				limitHandler = dialect.getLimitHandler();
+				final MutableInteger parameterMarkerPosition = new MutableInteger( jdbcParameterBindings.getBindings().size() );
 				sql = limitHandler.processSql(
 						jdbcSelect.getSqlString(),
 						limit,
 						queryOptions,
-						executionContext.getSession().getFactory().getServiceRegistry().getService(
-								ParameterMarkerStrategy.class ),
-						jdbcParameterBindings.getBindings().size() + 1
+						() -> parameterMarkerStrategy.createMarker( parameterMarkerPosition.incrementAndGet(), null )
 				);
 			}
 

hibernate-core/src/test/java/org/hibernate/orm/test/sql/ast/ParameterMarkerStrategyTests.java

@@ -19,7 +19,6 @@
 import org.hibernate.testing.jdbc.SQLStatementInspector;
 import org.hibernate.testing.orm.domain.gambit.EntityOfBasics;
 import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.FailureExpected;
 import org.hibernate.testing.orm.junit.Jira;
 import org.hibernate.testing.orm.junit.RequiresDialect;
 import org.hibernate.testing.orm.junit.ServiceRegistry;