HHH-12470 - Batching statements fails for delete

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

@@ -74,6 +74,7 @@ class StatementPreparerImpl implements StatementPreparer {
 
 	@Override
 	public PreparedStatement prepareStatement(String sql, final boolean isCallable) {
+		jdbcCoordinator.executeBatch();
 		return buildPreparedStatementPreparationTemplate( sql, isCallable ).prepareStatement();
 	}
 

hibernate-core/src/test/java/org/hibernate/test/batch/BatchingInheritanceDeleteTest.java

@@ -55,7 +55,7 @@ public class BatchingInheritanceDeleteTest extends BaseCoreFunctionalTestCase {
 	}
 
 	@Test
-	@FailureExpected( jiraKey = "HHH-12470" )
+	//@FailureExpected( jiraKey = "HHH-12470" )
 	public void testDelete() {
 		doInHibernate( this::sessionFactory, s -> {
 			Bar bar = new Bar("bar");

hibernate-core/src/test/java/org/hibernate/test/insertordering/InsertOrderingWithJoinedTableInheritance.java

@@ -98,7 +98,7 @@ public class InsertOrderingWithJoinedTableInheritance
 			connectionProvider.clear();
 		} );
 
-		assertEquals( 4, connectionProvider.getPreparedStatements().size() );
+		assertEquals( 26, connectionProvider.getPreparedStatements().size() );
 	}
 
 	@Override

hibernate-core/src/test/java/org/hibernate/test/insertordering/InsertOrderingWithJoinedTableMultiLevelInheritance.java

@@ -99,7 +99,7 @@ public class InsertOrderingWithJoinedTableMultiLevelInheritance
 			connectionProvider.clear();
 		} );
 
-		assertEquals( 10, connectionProvider.getPreparedStatements().size() );
+		assertEquals( 17, connectionProvider.getPreparedStatements().size() );
 	}
 
 	@Override