HHH-16283 minor improvements

Author: NathanQingyangXu

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

@@ -18,7 +18,6 @@
 import org.hibernate.query.spi.QueryParameterImplementor;
 import org.hibernate.query.sql.spi.ParameterOccurrence;
 import org.hibernate.query.sql.spi.ParameterRecognizer;
-import org.hibernate.sql.ast.internal.ParameterMarkerStrategyStandard;
 import org.hibernate.sql.ast.spi.ParameterMarkerStrategy;
 
 /**
@@ -36,15 +35,19 @@ private enum ParameterStyle {
 	private Map<String, QueryParameterImplementor<?>> namedQueryParameters;
 	private Map<Integer, QueryParameterImplementor<?>> positionalQueryParameters;
 
-	private int parameterImplicitPosition;
+	private int ordinalParameterImplicitPosition;
+
+	private int nextParameterMarkerPosition;
 	private final ParameterMarkerStrategy parameterMarkerStrategy;
 
 	private List<ParameterOccurrence> parameterList;
 	private final StringBuilder sqlStringBuffer = new StringBuilder();
 
 	public ParameterRecognizerImpl(ParameterMarkerStrategy parameterMarkerStrategy) {
-		this.parameterMarkerStrategy = parameterMarkerStrategy == null ? ParameterMarkerStrategyStandard.INSTANCE : parameterMarkerStrategy;
-		parameterImplicitPosition = 1;
+		assert parameterMarkerStrategy != null;
+		ordinalParameterImplicitPosition = 1;
+		nextParameterMarkerPosition = 1;
+		this.parameterMarkerStrategy = parameterMarkerStrategy;
 	}
 
 	@Override
@@ -61,13 +64,13 @@ public void complete() {
 					if ( first ) {
 						throw new ParameterLabelException(
 								"Ordinal parameter labels start from '?" + position + "'"
-										+ " (ordinal parameters must be labelled from '?1')"
+								+ " (ordinal parameters must be labelled from '?1')"
 						);
 					}
 					else {
 						throw new ParameterLabelException(
 								"Gap between '?" + previous + "' and '?" + position + "' in ordinal parameter labels"
-										+ " (ordinal parameters must be labelled sequentially)"
+								+ " (ordinal parameters must be labelled sequentially)"
 						);
 					}
 				}
@@ -105,7 +108,7 @@ else if ( parameterStyle != ParameterStyle.JDBC ) {
 			throw new ParameterRecognitionException( "Cannot mix parameter styles between JDBC-style, ordinal and named in the same query" );
 		}
 
-		int implicitPosition = parameterImplicitPosition++;
+		int implicitPosition = ordinalParameterImplicitPosition++;
 
 		QueryParameterImplementor<?> parameter = null;
 
@@ -121,7 +124,7 @@ else if ( parameterStyle != ParameterStyle.JDBC ) {
 			positionalQueryParameters.put( implicitPosition, parameter );
 		}
 
-		recognizeParameter( parameter, implicitPosition );
+		recognizeParameter( parameter );
 	}
 
 	@Override
@@ -147,7 +150,7 @@ else if ( parameterStyle != ParameterStyle.NAMED ) {
 			namedQueryParameters.put( name, parameter );
 		}
 
-		recognizeParameter( parameter, parameterImplicitPosition++ );
+		recognizeParameter( parameter );
 	}
 
 	@Override
@@ -177,16 +180,16 @@ else if ( parameterStyle != ParameterStyle.NAMED ) {
 			positionalQueryParameters.put( position, parameter );
 		}
 
-		recognizeParameter( parameter, parameterImplicitPosition++ );
+		recognizeParameter( parameter );
 	}
 
 	@Override
 	public void other(char character) {
 		sqlStringBuffer.append( character );
 	}
 
-	private void recognizeParameter(QueryParameterImplementor parameter, int position) {
-		final String marker = parameterMarkerStrategy.createMarker( position, null );
+	private void recognizeParameter(QueryParameterImplementor<?> parameter) {
+		final String marker = parameterMarkerStrategy.createMarker( nextParameterMarkerPosition++, null );
 		final int markerLength = marker.length();
 		if ( parameterList == null ) {
 			parameterList = new ArrayList<>();

hibernate-core/src/main/java/org/hibernate/sql/ast/spi/ParameterMarkerStrategy.java

@@ -8,7 +8,7 @@
 import org.hibernate.type.descriptor.jdbc.JdbcType;
 
 /**
- * Strategy for generating parameter markers used in {@linkplain java.sql.PreparedStatement preparable} and native SQL strings.
+ * Strategy for generating parameter markers used in {@linkplain java.sql.PreparedStatement preparable} SQL strings.
  * <p/>
  * Generally Hibernate will use the JDBC standard marker - {@code ?}.  Many JDBC drivers support the
  * use of the "native" marker syntax of the underlying database - e.g. {@code $n}, {@code ?n}, ...

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

@@ -4,7 +4,6 @@
  */
 package org.hibernate.orm.test.sql.ast;
 
-import java.util.List;
 
 import org.hibernate.annotations.Filter;
 import org.hibernate.annotations.FilterDef;
@@ -30,6 +29,8 @@
 import jakarta.persistence.Table;
 import jakarta.persistence.Version;
 
+import java.util.List;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hibernate.internal.util.StringHelper.*;
 
@@ -130,7 +131,7 @@ public void testNativeQuery(SessionFactoryScope scope) {
 
 		statementInspector.clear();
 		scope.inTransaction( (session) -> {
-			session.createNativeQuery( "select count(1) from filtered_entity e where e.region = :region" )
+			session.createNativeQuery( "select count(1) from filtered_entity e where e.region = :region", Integer.class )
 					.setParameter( "region", "ABC" )
 					.uniqueResult();
 
@@ -141,13 +142,14 @@ public void testNativeQuery(SessionFactoryScope scope) {
 
 		statementInspector.clear();
 		scope.inTransaction( (session) -> {
-			session.createNativeQuery( "select count(1) from filtered_entity e where e.region in (:region)" )
+			session.createNativeQuery( "select count(1) from filtered_entity e where e.region in (:region) and e.name = :name", Integer.class )
 					.setParameterList( "region", List.of( "ABC", "DEF" ) )
+					.setParameter( "name", "It" )
 					.uniqueResult();
 
 			assertThat( statementInspector.getSqlQueries() ).hasSize( 1 );
-			assertThat( count( statementInspector.getSqlQueries().get( 0 ), "?" ) ).isEqualTo( 2 );
-			assertThat( statementInspector.getSqlQueries().get( 0 ) ).contains( "?1", "?2" );
+			assertThat( count( statementInspector.getSqlQueries().get( 0 ), "?" ) ).isEqualTo( 3 );
+			assertThat( statementInspector.getSqlQueries().get( 0 ) ).contains( "?1" ).contains( "?2" ).contains( "?3" );
 		} );
 	}