HHH-20287 DataException ( Parameter is not set) when updating only the version of an Entity with a PartitionKey

Co-authored-by: Marco Belladelli <marcobladel@gmail.com>
Co-authored-by: Christian Beikov <christian.beikov@gmail.com>

Author: 3 people

hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinatorStandard.java

@@ -9,6 +9,7 @@
 import java.util.Locale;
 import java.util.function.Supplier;
 
+import org.checkerframework.checker.nullness.qual.Nullable;
 import org.hibernate.HibernateException;
 import org.hibernate.Internal;
 import org.hibernate.StaleObjectStateException;
@@ -140,7 +141,14 @@ public void forceVersionIncrement(
 		if ( versionUpdateGroup == null ) {
 			throw new HibernateException( "Cannot force version increment relative to subtype; use the root type" );
 		}
-		doVersionUpdate( null, id, nextVersion, currentVersion, null, session );
+		doVersionUpdate( null, id, nextVersion, currentVersion, getLoadedState( id, session ), session );
+	}
+
+	private Object @Nullable [] getLoadedState(Object id, SharedSessionContractImplementor session) {
+		return entityPersister.hasPartitionedSelectionMapping()
+				? session.getPersistenceContextInternal()
+				.getEntityHolder( session.generateEntityKey( id, entityPersister ) ).getEntityEntry().getLoadedState()
+				: null;
 	}
 
 	@Override
@@ -153,7 +161,7 @@ public void forceVersionIncrement(
 		if ( versionUpdateGroup == null ) {
 			throw new HibernateException( "Cannot force version increment relative to subtype; use the root type" );
 		}
-		doVersionUpdate( null, id, nextVersion, currentVersion, batching, null, session );
+		doVersionUpdate( null, id, nextVersion, currentVersion, batching, getLoadedState( id, session ), session );
 	}
 
 	@Override
@@ -174,6 +182,7 @@ public GeneratedValues update(
 							entity,
 							id,
 							values,
+							incomingOldValues,
 							oldVersion,
 							incomingDirtyAttributeIndexes,
 							session,
@@ -386,6 +395,7 @@ protected Supplier<GeneratedValues> handlePotentialImplicitForcedVersionIncremen
 			Object entity,
 			Object id,
 			Object[] values,
+			Object[] oldValues,
 			Object oldVersion,
 			int[] incomingDirtyAttributeIndexes,
 			SharedSessionContractImplementor session,
@@ -436,7 +446,14 @@ else if ( incomingDirtyAttributeIndexes != null ) {
 
 		// we have just the version being updated - use the special handling
 		assert newVersion != null;
-		final var generatedValues = doVersionUpdate( entity, id, newVersion, oldVersion, values, session );
+		final var generatedValues = doVersionUpdate(
+				entity,
+				id,
+				newVersion,
+				oldVersion,
+				oldValues == null ? values : oldValues,
+				session
+		);
 		return () -> generatedValues;
 	}
 
@@ -472,15 +489,15 @@ protected GeneratedValues doVersionUpdate(
 			Object id,
 			Object version,
 			Object oldVersion,
-			Object[] laodedState,
+			Object[] loadedState,
 			SharedSessionContractImplementor session) {
 		return doVersionUpdate(
 				entity,
 				id,
 				version,
 				oldVersion,
 				true,
-				laodedState,
+				loadedState,
 				session
 		);
 	}
@@ -511,12 +528,7 @@ protected GeneratedValues doVersionUpdate(
 				ParameterUsage.SET
 		);
 
-		if ( loadedState != null && entityPersister.hasPartitionedSelectionMapping() ) {
-			bindPartitionColumnValueBindings(
-					loadedState,
-					session,
-					mutationExecutor.getJdbcValueBindings() );
-		}
+		bindPartitionColumnValueBindings( loadedState, session, mutationExecutor.getJdbcValueBindings() );
 
 		// restrict the key
 		mutatingTableDetails.getKeyMapping().breakDownKeyJdbcValues(