HHH-19522 report failed optimistic lock checking for upsert()

upsert() should throw StaleObjectStateException if the version
verification fails

Author: gavinking

hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/MergeOperation.java

@@ -8,7 +8,7 @@
 
 import java.util.List;
 
-import org.hibernate.jdbc.Expectations;
+import org.hibernate.jdbc.Expectation;
 import org.hibernate.sql.exec.spi.JdbcParameterBinder;
 import org.hibernate.sql.model.MutationTarget;
 import org.hibernate.sql.model.MutationType;
@@ -25,13 +25,12 @@ public MergeOperation(
 			MutationTarget<?> mutationTarget,
 			String sql,
 			List<? extends JdbcParameterBinder> parameterBinders) {
-		super( tableDetails, mutationTarget, sql, false, Expectations.NONE, parameterBinders );
+		super( tableDetails, mutationTarget, sql, false, new Expectation.RowCount(), parameterBinders );
 	}
 
 	@Override
 	public MutationType getMutationType() {
 		return MutationType.UPDATE;
 	}
 
-
 }

hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/UpsertOperation.java

@@ -8,7 +8,7 @@
 
 import java.util.List;
 
-import org.hibernate.jdbc.Expectations;
+import org.hibernate.jdbc.Expectation;
 import org.hibernate.sql.exec.spi.JdbcParameterBinder;
 import org.hibernate.sql.model.MutationTarget;
 import org.hibernate.sql.model.MutationType;
@@ -25,13 +25,12 @@ public UpsertOperation(
 			MutationTarget<?> mutationTarget,
 			String sql,
 			List<? extends JdbcParameterBinder> parameterBinders) {
-		super( tableDetails, mutationTarget, sql, false, Expectations.NONE, parameterBinders );
+		super( tableDetails, mutationTarget, sql, false, new Expectation.RowCount(), parameterBinders );
 	}
 
 	@Override
 	public MutationType getMutationType() {
 		return MutationType.UPDATE;
 	}
 
-
 }

hibernate-core/src/test/java/org/hibernate/orm/test/stateless/UpsertVersionedTest.java

@@ -3,45 +3,72 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import jakarta.persistence.Version;
+import org.hibernate.StaleObjectStateException;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 @SessionFactory
 @DomainModel(annotatedClasses = UpsertVersionedTest.Record.class)
 public class UpsertVersionedTest {
-    @Test void test(SessionFactoryScope scope) {
-        scope.inStatelessTransaction(s-> {
-            s.upsert(new Record(123L,null,"hello earth"));
-            s.upsert(new Record(456L,2L,"hello mars"));
-        });
-        scope.inStatelessTransaction(s-> {
-            assertEquals("hello earth",s.get(Record.class,123L).message);
-            assertEquals("hello mars",s.get(Record.class,456L).message);
-        });
-        scope.inStatelessTransaction(s-> {
-            s.upsert(new Record(123L,0L,"goodbye earth"));
-        });
-        scope.inStatelessTransaction(s-> {
-            assertEquals("goodbye earth",s.get(Record.class,123L).message);
-            assertEquals("hello mars",s.get(Record.class,456L).message);
-        });
-        scope.inStatelessTransaction(s-> {
-            s.upsert(new Record(456L,3L,"goodbye mars"));
-        });
-        scope.inStatelessTransaction(s-> {
-            assertEquals("goodbye earth",s.get(Record.class,123L).message);
-            assertEquals("goodbye mars",s.get(Record.class,456L).message);
-        });
-    }
-    @Entity(name = "Record")
-    static class Record {
-        @Id Long id;
-        @Version Long version;
-        String message;
+
+	@Test void test(SessionFactoryScope scope) {
+		scope.getSessionFactory().getSchemaManager().truncateMappedObjects();
+		scope.inStatelessTransaction(s-> {
+			s.upsert(new Record(123L,null,"hello earth"));
+			s.upsert(new Record(456L,2L,"hello mars"));
+		});
+		scope.inStatelessTransaction(s-> {
+			assertEquals( "hello earth", s.get( Record.class,123L).message );
+			assertEquals( "hello mars", s.get( Record.class,456L).message );
+		});
+		scope.inStatelessTransaction(s-> {
+			s.upsert(new Record(123L,0L,"goodbye earth"));
+		});
+		scope.inStatelessTransaction(s-> {
+			assertEquals( "goodbye earth", s.get( Record.class,123L).message );
+			assertEquals( "hello mars", s.get( Record.class,456L).message );
+		});
+		scope.inStatelessTransaction(s-> {
+			s.upsert(new Record(456L,3L,"goodbye mars"));
+		});
+		scope.inStatelessTransaction(s-> {
+			assertEquals( "goodbye earth", s.get( Record.class,123L).message );
+			assertEquals( "goodbye mars", s.get( Record.class,456L).message );
+		});
+	}
+
+	@Test void testStaleUpsert(SessionFactoryScope scope) {
+		scope.getSessionFactory().getSchemaManager().truncateMappedObjects();
+		scope.inStatelessTransaction( s -> {
+			s.insert(new Record(789L, 1L, "hello world"));
+		} );
+		scope.inStatelessTransaction( s -> {
+			s.upsert(new Record(789L, 1L, "hello mars"));
+		} );
+		try {
+			scope.inStatelessTransaction( s -> {
+				s.upsert(new Record( 789L, 1L, "hello venus"));
+			} );
+			fail();
+		}
+		catch (StaleObjectStateException sose) {
+			//expected
+		}
+		scope.inStatelessTransaction( s-> {
+			assertEquals( "hello mars", s.get(Record.class,789L).message );
+		} );
+	}
+
+	@Entity(name = "Record")
+	static class Record {
+		@Id Long id;
+		@Version Long version;
+		String message;
 
         Record(Long id, Long version, String message) {
             this.id = id;