WIP

Author: beikov

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

@@ -12,6 +12,7 @@
 
 import org.hibernate.engine.jdbc.mutation.group.PreparedStatementDetails;
 import org.hibernate.engine.jdbc.mutation.group.PreparedStatementGroup;
+import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
 import org.hibernate.engine.jdbc.spi.JdbcServices;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.jdbc.Expectation;
@@ -66,8 +67,10 @@ public TableMapping getMutatingTableDetails() {
 	@Override
 	public void releaseStatement(SharedSessionContractImplementor session) {
 		if ( statement != null ) {
-			session.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release( statement );
+			final JdbcCoordinator jdbcCoordinator = session.getJdbcCoordinator();
+			jdbcCoordinator.getLogicalConnection().getResourceRegistry().release( statement );
 			statement = null;
+			jdbcCoordinator.afterStatementExecution();
 		}
 	}
 

hibernate-core/src/main/java/org/hibernate/id/insert/GetGeneratedKeysDelegate.java

@@ -133,6 +133,7 @@ public Object performInsert(
 			}
 			finally {
 				jdbcCoordinator.getLogicalConnection().getResourceRegistry().release( insertStatement );
+				jdbcCoordinator.afterStatementExecution();
 			}
 		}
 		catch (SQLException e) {

hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java

@@ -697,6 +697,7 @@ private ProcedureOutputsImpl buildOutputs() {
 		}
 		catch (SQLException e) {
 			getSession().getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release( statement );
+			getSession().getJdbcCoordinator().afterStatementExecution();
 			throw getSession().getJdbcServices().getSqlExceptionHelper().convert(
 					e,
 					"Error registering CallableStatement parameters",

hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureOutputsImpl.java

@@ -146,10 +146,4 @@ protected Output buildFunctionReturn() {
 			return buildResultSetOutput( () -> results );
 		}
 	}
-
-	@Override
-	public void release() {
-		super.release();
-		getResultContext().getSession().getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release( callableStatement );
-	}
 }

hibernate-core/src/main/java/org/hibernate/result/internal/OutputsImpl.java

@@ -16,6 +16,7 @@
 import java.util.function.Supplier;
 
 import org.hibernate.JDBCException;
+import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.internal.CoreLogging;
 import org.hibernate.procedure.internal.ProcedureCallImpl;
@@ -131,7 +132,9 @@ public boolean goToNext() {
 
 	@Override
 	public void release() {
-		context.getSession().getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release( jdbcStatement );
+		final JdbcCoordinator jdbcCoordinator = context.getSession().getJdbcCoordinator();
+		jdbcCoordinator.getLogicalConnection().getResourceRegistry().release( jdbcStatement );
+		jdbcCoordinator.afterStatementExecution();
 	}
 
 	private List<?> extractCurrentResults() {

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

@@ -378,7 +378,8 @@ private boolean performUpdate(
 	private void performInsert(JdbcValueBindings jdbcValueBindings, SharedSessionContractImplementor session) {
 		final JdbcInsertMutation jdbcInsert = createJdbcInsert( session );
 
-		final PreparedStatement insertStatement = createStatementDetails( jdbcInsert, session );
+		final JdbcCoordinator jdbcCoordinator = session.getJdbcCoordinator();
+		final PreparedStatement insertStatement = createStatementDetails( jdbcInsert, jdbcCoordinator );
 
 		try {
 			session.getJdbcServices().getSqlStatementLogger().logStatement( jdbcInsert.getSqlString() );
@@ -404,11 +405,12 @@ private void performInsert(JdbcValueBindings jdbcValueBindings, SharedSessionCon
 				} );
 			}
 
-			session.getJdbcCoordinator().getResultSetReturn()
+			jdbcCoordinator.getResultSetReturn()
 					.executeUpdate( insertStatement, jdbcInsert.getSqlString() );
 		}
 		finally {
-			session.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().release( insertStatement );
+			jdbcCoordinator.getLogicalConnection().getResourceRegistry().release( insertStatement );
+			jdbcCoordinator.afterStatementExecution();
 		}
 	}
 
@@ -449,11 +451,10 @@ private JdbcInsertMutation createJdbcInsert(SharedSessionContractImplementor ses
 
 	private static PreparedStatement createStatementDetails(
 			PreparableMutationOperation operation,
-			SharedSessionContractImplementor session) {
-		final JdbcCoordinator jdbcCoordinator = session.getJdbcCoordinator();
+			JdbcCoordinator jdbcCoordinator) {
 		final MutationStatementPreparer statementPreparer = jdbcCoordinator.getMutationStatementPreparer();
 		final PreparedStatement statement = statementPreparer.prepareStatement( operation.getSqlString(), false );
-		session.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().register( null, statement );
+		jdbcCoordinator.getLogicalConnection().getResourceRegistry().register( null, statement );
 		return statement;
 	}
 

hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/DeferredResultSetAccess.java

@@ -17,6 +17,7 @@
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.pagination.LimitHandler;
 import org.hibernate.dialect.pagination.NoopLimitHandler;
+import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
 import org.hibernate.engine.jdbc.spi.SqlStatementLogger;
 import org.hibernate.engine.spi.SessionEventListenerManager;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
@@ -321,11 +322,12 @@ public void release() {
 		}
 
 		if ( preparedStatement != null ) {
-			getPersistenceContext().getJdbcCoordinator()
-					.getLogicalConnection()
+			final JdbcCoordinator jdbcCoordinator = getPersistenceContext().getJdbcCoordinator();
+			jdbcCoordinator.getLogicalConnection()
 					.getResourceRegistry()
 					.release( preparedStatement );
 			preparedStatement = null;
+			jdbcCoordinator.afterStatementExecution();
 		}
 	}
 }