HHH-12787 - SessionJdbcBatchTest hangs with DB2

Author: vladmihalcea

hibernate-agroal/src/test/java/org/hibernate/test/agroal/AgroalSkipAutoCommitTest.java

@@ -9,6 +9,8 @@
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.test.agroal.util.PreparedStatementSpyConnectionProvider;
+import org.hibernate.testing.DialectChecks;
+import org.hibernate.testing.RequiresDialectFeature;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 import org.junit.Test;
 
@@ -28,6 +30,7 @@
 /**
  * @author Vlad Mihalcea
  */
+@RequiresDialectFeature(DialectChecks.SupportsJdbcDriverProxying.class)
 public class AgroalSkipAutoCommitTest extends BaseCoreFunctionalTestCase {
 
 private PreparedStatementSpyConnectionProvider connectionProvider = new PreparedStatementSpyConnectionProvider();

hibernate-core/src/test/java/org/hibernate/jpa/test/criteria/literal/AbstractCriteriaLiteralHandlingModeTest.java

@@ -20,41 +20,27 @@
 import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
 
 import org.hibernate.testing.RequiresDialect;
+import org.hibernate.testing.jdbc.SQLStatementInterceptor;
 import org.hibernate.test.util.jdbc.PreparedStatementSpyConnectionProvider;
 import org.junit.Before;
 import org.junit.Test;
 
 import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
+import static org.hibernate.testing.transaction.TransactionUtil.setJdbcTimeout;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 /**
  * @author Vlad Mihalcea
  */
 public abstract class AbstractCriteriaLiteralHandlingModeTest extends BaseEntityManagerFunctionalTestCase {
 
-private PreparedStatementSpyConnectionProvider connectionProvider;
+private SQLStatementInterceptor sqlStatementInterceptor;
 
 @Override
-protected Map getConfig() {
-Map config = super.getConfig();
-config.put(
-org.hibernate.cfg.AvailableSettings.CONNECTION_PROVIDER,
-connectionProvider
-);
-return config;
-}
-
-@Override
-public void buildEntityManagerFactory() {
-connectionProvider = new PreparedStatementSpyConnectionProvider( false, false );
-super.buildEntityManagerFactory();
-}
-
-@Override
-public void releaseResources() {
-super.releaseResources();
-connectionProvider.stop();
+protected void addConfigOptions(Map options) {
+sqlStatementInterceptor = new SQLStatementInterceptor( options );
 }
 
 @Override
@@ -101,12 +87,12 @@ public void testLiteralHandlingMode() throws Exception {
 entity.get( "name" )
 );
 
-connectionProvider.clear();
-List<Tuple> tuples = entityManager.createQuery( query )
-.getResultList();
+sqlStatementInterceptor.clear();
+
+List<Tuple> tuples = entityManager.createQuery( query ).getResultList();
 assertEquals( 1, tuples.size() );
 
-assertNotNull( connectionProvider.getPreparedStatement( expectedSQL() ) );
+sqlStatementInterceptor.assertExecuted( expectedSQL() );
 } );
 }
 

hibernate-core/src/test/java/org/hibernate/jpa/test/criteria/nulliteral/CriteriaLiteralsTest.java

@@ -29,7 +29,7 @@
 import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
 
 import org.hibernate.testing.RequiresDialect;
-import org.hibernate.test.util.jdbc.PreparedStatementSpyConnectionProvider;
+import org.hibernate.testing.jdbc.SQLStatementInterceptor;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -44,29 +44,12 @@
  */
 @RequiresDialect(H2Dialect.class)
 public class CriteriaLiteralsTest extends BaseEntityManagerFunctionalTestCase {
-
-private PreparedStatementSpyConnectionProvider connectionProvider;
 
-@Override
-protected Map getConfig() {
-Map config = super.getConfig();
-config.put(
-org.hibernate.cfg.AvailableSettings.CONNECTION_PROVIDER,
-connectionProvider
-);
-return config;
-}
-
-@Override
-public void buildEntityManagerFactory() {
-connectionProvider = new PreparedStatementSpyConnectionProvider( false, false );
-super.buildEntityManagerFactory();
-}
+private SQLStatementInterceptor sqlStatementInterceptor;
 
 @Override
-public void releaseResources() {
-super.releaseResources();
-connectionProvider.stop();
+protected void addConfigOptions(Map options) {
+sqlStatementInterceptor = new SQLStatementInterceptor( options );
 }
 
 @Override
@@ -128,16 +111,15 @@ public void testLiteralsInWhereClause() throws Exception {
 entity.get( "name" )
 );
 
-connectionProvider.clear();
+sqlStatementInterceptor.clear();
 List<Tuple> tuples = entityManager.createQuery( query )
 .getResultList();
 
 assertEquals(
 1,
-connectionProvider.getPreparedStatements().size()
+sqlStatementInterceptor.getSqlQueries().size()
 );
-assertNotNull( connectionProvider.getPreparedStatement(
-"select 'abc' as col_0_0_, criteriali0_.name as col_1_0_ from Book criteriali0_ where criteriali0_.name=?" ) );
+sqlStatementInterceptor.assertExecuted("select 'abc' as col_0_0_, criteriali0_.name as col_1_0_ from Book criteriali0_ where criteriali0_.name=?");
 assertTrue( tuples.isEmpty() );
 } );
 }
@@ -178,12 +160,12 @@ private void testNumericLiterals(EntityManager entityManager, String expectedSQL
 entity.get( "name" )
 );
 
-connectionProvider.clear();
-List<Tuple> tuples = entityManager.createQuery( query )
-.getResultList();
+sqlStatementInterceptor.clear();
+
+List<Tuple> tuples = entityManager.createQuery( query ).getResultList();
 assertEquals( 1, tuples.size() );
 
-assertNotNull( connectionProvider.getPreparedStatement(expectedSQL) );
+sqlStatementInterceptor.assertExecuted( expectedSQL );
 }
 
 @Test
@@ -200,15 +182,13 @@ public void testCriteriaParameters() throws Exception {
 ), cb.equal( authors.index(), 0 ) )
 .select( authors.get( "name" ) );
 
-connectionProvider.clear();
+sqlStatementInterceptor.clear();
 entityManager.createQuery( query ).getResultList();
 assertEquals(
 1,
-connectionProvider.getPreparedStatements().size()
-);
-assertNotNull( connectionProvider.getPreparedStatement(
-"select authors1_.name as col_0_0_ from Book criteriali0_ inner join Author authors1_ on criteriali0_.id=authors1_.book_id where criteriali0_.name=? and authors1_.index_id=0" )
+sqlStatementInterceptor.getSqlQueries().size()
 );
+sqlStatementInterceptor.assertExecuted( "select authors1_.name as col_0_0_ from Book criteriali0_ inner join Author authors1_ on criteriali0_.id=authors1_.book_id where criteriali0_.name=? and authors1_.index_id=0" );
 } );
 }
 

hibernate-core/src/test/java/org/hibernate/jpa/test/ejb3configuration/DisableDiscardPersistenceContextOnCloseTest.java

@@ -14,6 +14,8 @@
 import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
 import org.hibernate.jpa.test.Wallet;
 
+import org.hibernate.testing.DialectChecks;
+import org.hibernate.testing.RequiresDialectFeature;
 import org.hibernate.test.util.jdbc.PreparedStatementSpyConnectionProvider;
 import org.junit.Test;
 
@@ -24,6 +26,7 @@
 /**
  * @author Vlad Mihalcea
  */
+@RequiresDialectFeature(DialectChecks.SupportsJdbcDriverProxying.class)
 public class DisableDiscardPersistenceContextOnCloseTest extends BaseEntityManagerFunctionalTestCase {
 
 private PreparedStatementSpyConnectionProvider connectionProvider = new PreparedStatementSpyConnectionProvider( false, false );

hibernate-core/src/test/java/org/hibernate/jpa/test/ejb3configuration/EnableDiscardPersistenceContextOnCloseTest.java

@@ -9,10 +9,14 @@
 import java.util.Map;
 import javax.persistence.EntityManager;
 
+import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.jpa.AvailableSettings;
 import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
 import org.hibernate.jpa.test.Wallet;
 
+import org.hibernate.testing.DialectChecks;
+import org.hibernate.testing.RequiresDialectFeature;
+import org.hibernate.testing.SkipForDialect;
 import org.hibernate.test.util.jdbc.PreparedStatementSpyConnectionProvider;
 import org.junit.Test;
 
@@ -23,6 +27,7 @@
 /**
  * @author Vlad Mihalcea
  */
+@RequiresDialectFeature(DialectChecks.SupportsJdbcDriverProxying.class)
 public class EnableDiscardPersistenceContextOnCloseTest extends BaseEntityManagerFunctionalTestCase {
 
 private PreparedStatementSpyConnectionProvider connectionProvider = new PreparedStatementSpyConnectionProvider( false, false );

hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/EntityGraphWithFetchAnnotationTest.java

@@ -23,6 +23,7 @@
 import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
 
 import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.jdbc.SQLStatementInterceptor;
 import org.hibernate.test.util.jdbc.PreparedStatementSpyConnectionProvider;
 import org.junit.Test;
 
@@ -36,28 +37,11 @@
 public class EntityGraphWithFetchAnnotationTest
 extends BaseEntityManagerFunctionalTestCase {
 
-private PreparedStatementSpyConnectionProvider connectionProvider;
+private SQLStatementInterceptor sqlStatementInterceptor;
 
 @Override
-protected Map getConfig() {
-Map config = super.getConfig();
-config.put(
-org.hibernate.cfg.AvailableSettings.CONNECTION_PROVIDER,
-connectionProvider
-);
-return config;
-}
-
-@Override
-public void buildEntityManagerFactory() {
-connectionProvider = new PreparedStatementSpyConnectionProvider( false, false );
-super.buildEntityManagerFactory();
-}
-
-@Override
-public void releaseResources() {
-super.releaseResources();
-connectionProvider.stop();
+protected void addConfigOptions(Map options) {
+sqlStatementInterceptor = new SQLStatementInterceptor( options );
 }
 
 @Override
@@ -79,15 +63,15 @@ public void testWithoutEntityGraph() {
 .createQuery( Order.class );
 criteriaQuery.from( Order.class );
 
-connectionProvider.clear();
+sqlStatementInterceptor.clear();
 
 entityManager
 .createQuery( criteriaQuery )
 .setFirstResult( 10 )
 .setMaxResults( 20 )
 .getResultList();
 
-assertFalse( connectionProvider.getPreparedSQLStatements().get( 0 ).toLowerCase().contains( "left outer join" ) );
+assertFalse( sqlStatementInterceptor.getSqlQueries().get( 0 ).toLowerCase().contains( "left outer join" ) );
 } );
 }
 
@@ -104,7 +88,7 @@ public void testWithEntityGraph() {
 EntityGraph<Order> entityGraph = entityManager.createEntityGraph( Order.class );
 entityGraph.addAttributeNodes( "products" );
 
-connectionProvider.clear();
+sqlStatementInterceptor.clear();
 
 entityManager
 .createQuery( criteriaQuery )
@@ -113,7 +97,7 @@ public void testWithEntityGraph() {
 .setHint( QueryHints.HINT_FETCHGRAPH, entityGraph )
 .getResultList();
 
-assertTrue( connectionProvider.getPreparedSQLStatements().get( 0 ).toLowerCase().contains( "left outer join" ) );
+assertTrue( sqlStatementInterceptor.getSqlQueries().get( 0 ).toLowerCase().contains( "left outer join" ) );
 } );
 }
 

hibernate-core/src/test/java/org/hibernate/jpa/test/lock/StatementIsClosedAfterALockExceptionTest.java

@@ -15,6 +15,8 @@
 import org.hibernate.Session;
 import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
 
+import org.hibernate.testing.DialectChecks;
+import org.hibernate.testing.RequiresDialectFeature;
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.test.util.jdbc.PreparedStatementSpyConnectionProvider;
 import org.hibernate.testing.transaction.TransactionUtil;
@@ -30,6 +32,7 @@
 /**
  * @author Andrea Boriero
  */
+@RequiresDialectFeature(DialectChecks.SupportsJdbcDriverProxying.class)
 public class StatementIsClosedAfterALockExceptionTest extends BaseEntityManagerFunctionalTestCase {
 
 private static final PreparedStatementSpyConnectionProvider CONNECTION_PROVIDER = new PreparedStatementSpyConnectionProvider( false, false );