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

- also fix the problem for Oracle

Author: gavinking

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

@@ -20,7 +20,9 @@
 import org.hibernate.engine.jdbc.mutation.internal.PreparedStatementGroupSingleTable;
 import org.hibernate.engine.jdbc.mutation.spi.Binding;
 import org.hibernate.engine.jdbc.mutation.spi.BindingGroup;
+import org.hibernate.engine.jdbc.spi.JdbcServices;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.jdbc.Expectation;
 import org.hibernate.persister.entity.mutation.EntityMutationTarget;
 import org.hibernate.persister.entity.mutation.EntityTableMapping;
 import org.hibernate.persister.entity.mutation.UpdateValuesAnalysis;
@@ -46,6 +48,7 @@ public class DeleteOrUpsertOperation implements SelfExecutingUpdateOperation {
 
 	private final OptionalTableUpdate optionalTableUpdate;
 
+	private final Expectation expectation = new Expectation.RowCount();
 
 	public DeleteOrUpsertOperation(
 			EntityMutationTarget mutationTarget,
@@ -118,7 +121,8 @@ private void performDelete(JdbcValueBindings jdbcValueBindings, SharedSessionCon
 
 		try {
 			final PreparedStatement upsertDeleteStatement = statementDetails.resolveStatement();
-			session.getJdbcServices().getSqlStatementLogger().logStatement( statementDetails.getSqlString() );
+			final JdbcServices jdbcServices = session.getJdbcServices();
+			jdbcServices.getSqlStatementLogger().logStatement( statementDetails.getSqlString() );
 
 			bindDeleteKeyValues(
 					jdbcValueBindings,
@@ -130,6 +134,16 @@ private void performDelete(JdbcValueBindings jdbcValueBindings, SharedSessionCon
 			final int rowCount = session.getJdbcCoordinator().getResultSetReturn()
 					.executeUpdate( upsertDeleteStatement, statementDetails.getSqlString() );
 			MODEL_MUTATION_LOGGER.tracef( "`%s` rows upsert-deleted from `%s`", rowCount, tableMapping.getTableName() );
+			try {
+				expectation.verifyOutcome( rowCount, upsertDeleteStatement, -1, statementDetails.getSqlString() );
+			}
+			catch (SQLException e) {
+				throw jdbcServices.getSqlExceptionHelper().convert(
+						e,
+						"Unable to verify outcome for upsert delete",
+						statementDetails.getSqlString()
+				);
+			}
 		}
 		finally {
 			statementDetails.releaseStatement( session );
@@ -197,14 +211,24 @@ private void performUpsert(JdbcValueBindings jdbcValueBindings, SharedSessionCon
 
 		try {
 			final PreparedStatement updateStatement = statementDetails.resolveStatement();
-			session.getJdbcServices().getSqlStatementLogger().logStatement( statementDetails.getSqlString() );
-
+			final JdbcServices jdbcServices = session.getJdbcServices();
+			jdbcServices.getSqlStatementLogger().logStatement( statementDetails.getSqlString() );
 			jdbcValueBindings.beforeStatement( statementDetails );
 
 			final int rowCount = session.getJdbcCoordinator().getResultSetReturn()
 					.executeUpdate( updateStatement, statementDetails.getSqlString() );
 
 			MODEL_MUTATION_LOGGER.tracef( "`%s` rows upserted into `%s`", rowCount, tableMapping.getTableName() );
+			try {
+				expectation.verifyOutcome( rowCount, updateStatement, -1, statementDetails.getSqlString() );
+			}
+			catch (SQLException e) {
+				throw jdbcServices.getSqlExceptionHelper().convert(
+						e,
+						"Unable to verify outcome for upsert",
+						statementDetails.getSqlString()
+				);
+			}
 		}
 		finally {
 			statementDetails.releaseStatement( session );