HHH-7689 - Error executing batch should abort rest of batch for "cleanliness" sake

Author: sebersole

hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/AbstractBatchImpl.java

@@ -148,36 +148,35 @@ private PreparedStatement buildBatchStatement(String sql, boolean callable) {
 	@Override
 	public final void execute() {
 		notifyObserversExplicitExecution();
-		if ( statements.isEmpty() ) {
+		if ( getStatements().isEmpty() ) {
 			return;
 		}
+
 		try {
-			try {
-				doExecuteBatch();
-			}
-			finally {
-				releaseStatements();
-			}
+			doExecuteBatch();
 		}
 		finally {
-			statements.clear();
+			releaseStatements();
 		}
 	}
 
-	private void releaseStatements() {
+	protected void releaseStatements() {
 		for ( PreparedStatement statement : getStatements().values() ) {
-			try {
-				statement.clearBatch();
-				jdbcCoordinator.release( statement );
-			}
-			catch ( SQLException e ) {
-				LOG.unableToReleaseBatchStatement();
-				LOG.sqlExceptionEscapedProxy( e );
-			}
+			clearBatch( statement );
+			jdbcCoordinator.release( statement );
 		}
 		getStatements().clear();
 	}
 
+	protected void clearBatch(PreparedStatement statement) {
+		try {
+			statement.clearBatch();
+		}
+		catch ( SQLException e ) {
+			LOG.unableToReleaseBatchStatement();
+		}
+	}
+
 	/**
 	 * Convenience method to notify registered observers of an explicit execution of this batch.
 	 */

hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/NonBatchingBatch.java

@@ -71,7 +71,13 @@ public void addToBatch() {
 				throw e;
 			}
 		}
-		getStatements().clear();
+
+		releaseStatements();
+	}
+
+	@Override
+	protected void clearBatch(PreparedStatement statement) {
+		// no need to call PreparedStatement#clearBatch here...
 	}
 
 	@Override

hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java

@@ -804,9 +804,9 @@ void settersOfLazyClassesCannotBeFinal(String entityName,
 	void splitQueries(String sourceQuery,
 					  int length);
 
-	@LogMessage(level = ERROR)
-	@Message(value = "SQLException escaped proxy", id = 246)
-	void sqlExceptionEscapedProxy(@Cause SQLException e);
+//	@LogMessage(level = ERROR)
+//	@Message(value = "SQLException escaped proxy", id = 246)
+//	void sqlExceptionEscapedProxy(@Cause SQLException e);
 
 	@LogMessage(level = WARN)
 	@Message(value = "SQL Error: %s, SQLState: %s", id = 247)