Fix parameters bind

README.md

@@ -31,14 +31,14 @@ Learn more at <http://hibernate.org/reactive>.
 Hibernate Reactive has been tested with:
 
 - Java 17, 21, 24
-- PostgreSQL 16
+- PostgreSQL 17
 - MySQL 9
 - MariaDB 11
 - Db2 12
-- CockroachDB v24
-- MS SQL Server 2022
+- CockroachDB v25
+- MS SQL Server 2025
 - Oracle 23
-- [Hibernate ORM][] 7.0.2.Final
+- [Hibernate ORM][] 7.1.0.Final
 - [Vert.x Reactive PostgreSQL Client](https://vertx.io/docs/vertx-pg-client/java/) 5.0.0
 - [Vert.x Reactive MySQL Client](https://vertx.io/docs/vertx-mysql-client/java/) 5.0.0
 - [Vert.x Reactive Db2 Client](https://vertx.io/docs/vertx-db2-client/java/) 5.0.0

gradle.properties

@@ -39,10 +39,10 @@ org.gradle.java.installations.auto-download=false
 ### Settings the following properties will override the version defined in gradle/libs.versions.toml
 
 # The default Hibernate ORM version (override using `-PhibernateOrmVersion=the.version.you.want`)
-#hibernateOrmVersion = 7.0.2.Final
+#hibernateOrmVersion = 7.1.0.Final
 
 # Override default Hibernate ORM Gradle plugin version
-#hibernateOrmGradlePluginVersion = 7.0.2.Final
+#hibernateOrmGradlePluginVersion = 7.1.0.Final
 
 # If set to true, skip Hibernate ORM version parsing (default is true, if set to null)
 # this is required when using intervals or weird versions or the build will fail

gradle/libs.versions.toml

@@ -1,7 +1,7 @@
 [versions]
 assertjVersion = "3.27.3"
-hibernateOrmVersion = "7.0.9.Final"
-hibernateOrmGradlePluginVersion = "7.0.9.Final"
+hibernateOrmVersion = "7.1.0.Final"
+hibernateOrmGradlePluginVersion = "7.1.0.Final"
 jacksonDatabindVersion = "2.19.2"
 jbossLoggingAnnotationVersion = "3.0.4.Final"
 jbossLoggingVersion = "3.6.1.Final"

gradle/version.properties

@@ -1 +1,5 @@
-projectVersion=4.0.0-SNAPSHOT
+<<<<<<< HEAD
+projectVersion=4.0.0-SNAPSHOT
+=======
+projectVersion=3.1.0-SNAPSHOT
+>>>>>>> 2a11b54c ([#2387] Upgrade Hibernate ORM to 7.1.0.CR1)

hibernate-reactive-core/src/main/java/org/hibernate/reactive/id/insert/ReactiveInsertReturningDelegate.java

@@ -91,7 +91,7 @@ public TableMutationBuilder<?> createTableMutationBuilder(
 			return new TableInsertReturningBuilder( persister, tableReference, generatedColumns, sessionFactory );
 		}
 		else {
-			return new TableUpdateReturningBuilder<>( persister, tableReference, generatedColumns, sessionFactory );
+			return new TableUpdateReturningBuilder( persister, tableReference, generatedColumns, sessionFactory );
 		}
 	}
 

hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveAbstractEntityPersister.java

@@ -80,7 +80,6 @@
 import static org.hibernate.pretty.MessageHelper.infoString;
 import static org.hibernate.reactive.logging.impl.LoggerFactory.make;
 import static org.hibernate.reactive.util.impl.CompletionStages.completedFuture;
-import static org.hibernate.reactive.util.impl.CompletionStages.failedFuture;
 import static org.hibernate.reactive.util.impl.CompletionStages.logSqlException;
 import static org.hibernate.reactive.util.impl.CompletionStages.nullFuture;
 import static org.hibernate.reactive.util.impl.CompletionStages.voidFuture;
@@ -303,25 +302,25 @@ default CompletionStage<Object> reactiveGetCurrentVersion(Object id, SharedSessi
 
 		return getReactiveConnection( session )
 				.selectJdbc( delegate().getVersionSelectString(), params )
-				.thenCompose( resultSet -> currentVersion( session, resultSet ) );
+				.thenApply( resultSet -> currentVersion( session, resultSet ) );
 	}
 
-	private CompletionStage<Object> currentVersion(SharedSessionContractImplementor session, ResultSet resultSet) {
+	private Object currentVersion(SharedSessionContractImplementor session, ResultSet resultSet) {
 		try {
 			if ( !resultSet.next() ) {
-				return nullFuture();
+				return null;
 			}
 			if ( !isVersioned() ) {
-				return completedFuture( this );
+				return this;
 			}
-			return completedFuture( getVersionType()
-											.getJdbcMapping()
-											.getJdbcValueExtractor()
-											.extract( resultSet, 1, session ) );
+			return getVersionType()
+					.getJdbcMapping()
+					.getJdbcValueExtractor()
+					.extract( resultSet, 1, session );
 		}
 		catch (SQLException sqle) {
 			//can never happen
-			return failedFuture( new JDBCException( "error reading version", sqle ) );
+			throw new JDBCException( "error reading version", sqle );
 		}
 	}
 
@@ -474,13 +473,9 @@ default CompletionStage<Object> reactiveInitializeEnhancedEntityUsedAsProxy(
 			Object entity,
 			String nameOfAttributeBeingAccessed,
 			SharedSessionContractImplementor session) {
-
 		final BytecodeEnhancementMetadata enhancementMetadata = getEntityPersister().getBytecodeEnhancementMetadata();
 		final BytecodeLazyAttributeInterceptor currentInterceptor = enhancementMetadata.extractLazyInterceptor( entity );
-		if ( currentInterceptor instanceof EnhancementAsProxyLazinessInterceptor ) {
-			final EnhancementAsProxyLazinessInterceptor proxyInterceptor =
-					(EnhancementAsProxyLazinessInterceptor) currentInterceptor;
-
+		if ( currentInterceptor instanceof EnhancementAsProxyLazinessInterceptor proxyInterceptor ) {
 			final EntityKey entityKey = proxyInterceptor.getEntityKey();
 			final Object identifier = entityKey.getIdentifier();
 
@@ -494,19 +489,17 @@ default CompletionStage<Object> reactiveInitializeEnhancedEntityUsedAsProxy(
 									.handleEntityNotFound( entityKey.getEntityName(), identifier );
 						}
 
+						final LazyAttributeLoadingInterceptor interceptor = enhancementMetadata
+								.injectInterceptor( entity, identifier, session );
+
 						if ( nameOfAttributeBeingAccessed == null ) {
 							return null;
 						}
 						else {
-							final LazyAttributeLoadingInterceptor interceptor = enhancementMetadata
-									.injectInterceptor( entity, identifier, session );
 							return interceptor.readObject(
-									entity,
-									nameOfAttributeBeingAccessed,
-									interceptor.isAttributeLoaded( nameOfAttributeBeingAccessed )
-											? getPropertyValue( entity, nameOfAttributeBeingAccessed )
-											: ( (LazyPropertyInitializer) this )
-													.initializeLazyProperty( nameOfAttributeBeingAccessed, entity, session )
+									entity, nameOfAttributeBeingAccessed, interceptor.isAttributeLoaded( nameOfAttributeBeingAccessed )
+																		  ? getPropertyValue( entity, nameOfAttributeBeingAccessed )
+																		  : ( (LazyPropertyInitializer) this ).initializeLazyProperty( nameOfAttributeBeingAccessed, entity, session )
 							);
 						}
 					} );
@@ -528,11 +521,12 @@ private CompletionStage<?> loadFromDatabaseOrCache(
 				return completedFuture( loaded );
 			}
 		}
-		return ( (ReactiveSingleIdEntityLoader<?>) determineLoaderToUse( session ) )
-				.load( identifier, entity, LockOptions.NONE, session );
+		final LockOptions lockOptions = new LockOptions();
+		return ( (ReactiveSingleIdEntityLoader<?>) determineLoaderToUse( session, lockOptions ) )
+				.load( identifier, entity, lockOptions, session );
 	}
 
-	SingleIdEntityLoader<?> determineLoaderToUse(SharedSessionContractImplementor session);
+	SingleIdEntityLoader<?> determineLoaderToUse(SharedSessionContractImplementor session, LockOptions lockOptions);
 
 	boolean initializeLazyProperty(String fieldName, Object entity, EntityEntry entry, int lazyIndex, Object selectedValue);
 

hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveJoinedSubclassEntityPersister.java

@@ -139,8 +139,8 @@ protected AttributeMapping buildPluralAttributeMapping(
 	}
 
 	@Override
-	public SingleIdEntityLoader<?> determineLoaderToUse(SharedSessionContractImplementor session) {
-		return super.determineLoaderToUse( session );
+	public SingleIdEntityLoader<?> determineLoaderToUse(SharedSessionContractImplementor session, LockOptions lockOptions) {
+		return super.determineLoaderToUse( session, lockOptions );
 	}
 
 	@Override

hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveSingleTableEntityPersister.java

@@ -86,8 +86,8 @@ public GeneratedValuesMutationDelegate createInsertDelegate() {
 	}
 
 	@Override
-	public SingleIdEntityLoader<?> determineLoaderToUse(SharedSessionContractImplementor session) {
-		return super.determineLoaderToUse( session );
+	public SingleIdEntityLoader<?> determineLoaderToUse(SharedSessionContractImplementor session, LockOptions lockOptions) {
+		return super.determineLoaderToUse( session, lockOptions );
 	}
 
 	@Override

hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveUnionSubclassEntityPersister.java

@@ -139,8 +139,8 @@ protected AttributeMapping buildPluralAttributeMapping(
 	}
 
 	@Override
-	public SingleIdEntityLoader<?> determineLoaderToUse(SharedSessionContractImplementor session) {
-		return super.determineLoaderToUse( session );
+	public SingleIdEntityLoader<?> determineLoaderToUse(SharedSessionContractImplementor session, LockOptions lockOptions) {
+		return super.determineLoaderToUse( session, lockOptions );
 	}
 
 	@Override

hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/impl/ReactiveServiceInitiators.java

@@ -22,6 +22,7 @@
 import org.hibernate.engine.jdbc.internal.SqlStatementLoggerInitiator;
 import org.hibernate.engine.jndi.internal.JndiServiceInitiator;
 import org.hibernate.event.internal.EntityCopyObserverFactoryInitiator;
+import org.hibernate.internal.util.cache.InternalCacheFactoryInitiator;
 import org.hibernate.persister.internal.PersisterFactoryInitiator;
 import org.hibernate.property.access.internal.PropertyAccessStrategyResolverInitiator;
 import org.hibernate.reactive.context.impl.VertxContextInitiator;
@@ -161,6 +162,9 @@ private static List<StandardServiceInitiator<?>> buildInitialServiceInitiatorLis
 		// Custom for Hibernate Reactive: BatchLoaderFactory
 		serviceInitiators.add( ReactiveBatchLoaderFactoryInitiator.INSTANCE );
 
+		// [standard] InternalCacheFactoryService
+		serviceInitiators.add( InternalCacheFactoryInitiator.INSTANCE );
+
 		// --- end of services defined by Hibernate ORM
 
 		// --- custom ones follow:

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

@@ -142,19 +142,14 @@ private ReactiveSelectQueryPlan<R> reactiveSelectPlan() {
 	private ReactiveNonSelectQueryPlan reactiveNonSelectPlan() {
 		final QueryInterpretationCache.Key cacheKey = generateNonSelectInterpretationsKey();
 		if ( cacheKey != null ) {
-			NonSelectQueryPlan queryPlan = getSession().getFactory().getQueryEngine()
-					.getInterpretationCache().getNonSelectQueryPlan( cacheKey );
+			NonSelectQueryPlan queryPlan = getSession().getFactory().getQueryEngine().getInterpretationCache().getNonSelectQueryPlan( cacheKey );
 			if ( queryPlan != null ) {
 				return (ReactiveNonSelectQueryPlan) queryPlan;
 			}
 		}
 
-		final String sqlString = expandParameterLists();
-		ReactiveNonSelectQueryPlan queryPlan = new ReactiveNativeNonSelectQueryPlan(
-				sqlString,
-				getQuerySpaces(),
-				getParameterOccurrences()
-		);
+		final String sqlString = expandParameterLists( 1 );
+		ReactiveNonSelectQueryPlan queryPlan = new ReactiveNativeNonSelectQueryPlan( sqlString, getQuerySpaces(), getParameterOccurrences() );
 		if ( cacheKey != null ) {
 			getSession().getFactory().getQueryEngine().getInterpretationCache()
 					.cacheNonSelectQueryPlan( cacheKey, queryPlan );

hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sql/spi/ReactiveNamedSqmQueryMemento.java

@@ -20,7 +20,7 @@
 import org.hibernate.query.sqm.spi.NamedSqmQueryMemento;
 import org.hibernate.query.sqm.tree.SqmStatement;
 import org.hibernate.query.sqm.tree.select.SqmSelectStatement;
-import org.hibernate.reactive.query.sqm.internal.ReactiveQuerySqmImpl;
+import org.hibernate.reactive.query.sqm.internal.ReactiveSqmQueryImpl;
 import org.hibernate.reactive.query.sqm.internal.ReactiveSqmSelectionQueryImpl;
 
 /**
@@ -49,10 +49,10 @@ public SqmQueryImplementor<E> toQuery(SharedSessionContractImplementor session)
 	public <T> SqmQueryImplementor<T> toQuery(SharedSessionContractImplementor session, Class<T> resultType) {
 		// A bit of a hack, I'm sure that if we have a better look at this we can avoid the instanceof
 		if ( delegate instanceof NamedHqlQueryMementoImpl ) {
-			return new ReactiveQuerySqmImpl<>( (NamedHqlQueryMementoImpl) delegate, resultType, session );
+			return new ReactiveSqmQueryImpl<>( (NamedHqlQueryMementoImpl) delegate, resultType, session );
 		}
 		if ( delegate instanceof NamedCriteriaQueryMementoImpl ) {
-			return new ReactiveQuerySqmImpl<>( (NamedCriteriaQueryMementoImpl) delegate, resultType, session );
+			return new ReactiveSqmQueryImpl<>( (NamedCriteriaQueryMementoImpl) delegate, resultType, session );
 		}
 		else {
 			throw new UnsupportedOperationException( "NamedSqmQueryMemento not recognized: " + delegate.getClass() );

hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/sqm/ReactiveSqmSelectionQuery.java

@@ -24,7 +24,7 @@
 /**
  * @see org.hibernate.query.sqm.SqmSelectionQuery
  */
-public interface ReactiveSqmSelectionQuery<R> extends ReactiveSelectionQuery<R>, SqmQuery {
+public interface ReactiveSqmSelectionQuery<R> extends ReactiveSelectionQuery<R>, SqmQuery<R> {
 
 	@Override
 	ReactiveSqmSelectionQuery<R> setParameter(String name, Object value);