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

- also fix the problem for upsert emulation with UPDATE/INSERT

Author: gavinking

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

@@ -13,6 +13,7 @@
 import java.util.Objects;
 import java.util.Set;
 
+import org.hibernate.StaleStateException;
 import org.hibernate.engine.jdbc.mutation.JdbcValueBindings;
 import org.hibernate.engine.jdbc.mutation.ParameterUsage;
 import org.hibernate.engine.jdbc.mutation.group.PreparedStatementDetails;
@@ -25,6 +26,7 @@
 import org.hibernate.engine.jdbc.spi.MutationStatementPreparer;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.exception.ConstraintViolationException;
 import org.hibernate.internal.util.collections.CollectionHelper;
 import org.hibernate.jdbc.Expectation;
 import org.hibernate.persister.entity.mutation.EntityMutationTarget;
@@ -52,6 +54,7 @@
 import org.hibernate.sql.model.internal.TableUpdateCustomSql;
 import org.hibernate.sql.model.internal.TableUpdateStandard;
 
+import static org.hibernate.exception.ConstraintViolationException.ConstraintKind.UNIQUE;
 import static org.hibernate.sql.model.ModelMutationLogging.MODEL_MUTATION_LOGGER;
 
 /**
@@ -152,20 +155,28 @@ public void performMutation(
 					wasUpdated = false;
 				}
 
-				if ( !wasUpdated ) {
-					MODEL_MUTATION_LOGGER.debugf(
-							"Upsert update altered no rows - inserting : %s",
-							tableMapping.getTableName()
-					);
-					performInsert( jdbcValueBindings, session );
+					if ( !wasUpdated ) {
+						MODEL_MUTATION_LOGGER.debugf(
+								"Upsert update altered no rows - inserting : %s",
+								tableMapping.getTableName()
+						);
+						try {
+							performInsert( jdbcValueBindings, session );
+						}
+						catch (ConstraintViolationException cve) {
+							throw cve.getKind() == UNIQUE
+									// assume it was the primary key constraint which was violated,
+									// due to a new version of the row existing in the database
+									? new StaleStateException( mutationTarget.getRolePath(), cve )
+									: cve;
+						}
+					}
 				}
 			}
+			finally {
+				jdbcValueBindings.afterStatement( tableMapping );
+			}
 		}
-		finally {
-			jdbcValueBindings.afterStatement( tableMapping );
-		}
-
-	}
 
 	private void performDelete(JdbcValueBindings jdbcValueBindings, SharedSessionContractImplementor session) {
 		final JdbcDeleteMutation jdbcDelete = createJdbcDelete( session );

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

@@ -7,7 +7,7 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import jakarta.persistence.Version;
-import org.hibernate.StaleObjectStateException;
+import org.hibernate.StaleStateException;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -60,7 +60,7 @@ public class UpsertVersionedTest {
 			} );
 			fail();
 		}
-		catch (StaleObjectStateException sose) {
+		catch (StaleStateException sse) {
 			//expected
 		}
 		scope.inStatelessTransaction( s-> {