diff --git a/hibernate-core/src/main/java/org/hibernate/relational/SchemaManager.java b/hibernate-core/src/main/java/org/hibernate/relational/SchemaManager.java index cb1d8cb80f3b..9b0ba453a69e 100644 --- a/hibernate-core/src/main/java/org/hibernate/relational/SchemaManager.java +++ b/hibernate-core/src/main/java/org/hibernate/relational/SchemaManager.java @@ -71,6 +71,11 @@ public interface SchemaManager extends jakarta.persistence.SchemaManager { * load script}. *

* Programmatic way to run {@link org.hibernate.tool.schema.spi.SchemaTruncator}. + *

+ * This operation does not affect the {@linkplain org.hibernate.Cache second-level cache}. + * Therefore, after calling {@code truncate()}, it might be necessary to also call + * {@link org.hibernate.Cache#evictAllRegions} to clean up data held in the second-level + * cache. * * @apiNote This operation is a synonym for {@link #truncate}. */ diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/PolymorphicCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/PolymorphicCacheTest.java index f986c3803352..826bebeb3617 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/PolymorphicCacheTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/polymorphism/PolymorphicCacheTest.java @@ -37,12 +37,8 @@ public void prepareTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createMutationQuery("delete from CacheHolder").executeUpdate(); - session.createMutationQuery( "delete Cacheable" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); + scope.getSessionFactory().getCache().evictAll(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MergeCollectionEventTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MergeCollectionEventTest.java index 68d36c2e3218..487532f4801b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MergeCollectionEventTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MergeCollectionEventTest.java @@ -63,20 +63,7 @@ protected void prepareBootstrapRegistryBuilder(BootstrapServiceRegistryBuilder b @Override protected void cleanupTestData() throws Exception { - Session s = openSession(); - s.beginTransaction(); - List aliases = s.createQuery( "from Alias" ).list(); - for ( Alias alias : aliases ) { - for ( Character character : alias.getCharacters() ) { - character.getAliases().clear(); - } - alias.getCharacters().clear(); - } - s.flush(); - s.createQuery( "delete Alias" ).executeUpdate(); - s.createQuery( "delete Character" ).executeUpdate(); - s.getTransaction().commit(); - s.close(); + sessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithJoinedTableMultiLevelInheritance.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithJoinedTableMultiLevelInheritance.java index bbdef6c27ba2..aafed6d0a29a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithJoinedTableMultiLevelInheritance.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithJoinedTableMultiLevelInheritance.java @@ -117,14 +117,7 @@ public void testBatchingAmongstSubClasses() { @After protected void cleanupTestData() { - sessionFactoryScope().inTransaction( session -> { - session.createMutationQuery( "delete Address" ).executeUpdate(); - session.createMutationQuery( "delete Person" ).executeUpdate(); - session.createMutationQuery( "delete SpecialPerson" ).executeUpdate(); - session.createMutationQuery( "delete AnotherPerson" ).executeUpdate(); - session.createMutationQuery( "delete Office" ).executeUpdate(); - session.createMutationQuery( "delete President" ).executeUpdate(); - } ); + sessionFactoryScope().getSessionFactory().getSchemaManager().truncate(); } @Entity(name = "Address") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ExpressionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ExpressionsTest.java index 8644e45a0583..907a00da7a87 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ExpressionsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ExpressionsTest.java @@ -13,6 +13,7 @@ import java.util.List; import org.hibernate.Session; +import org.hibernate.SessionFactory; import org.hibernate.community.dialect.AltibaseDialect; import org.hibernate.dialect.DB2Dialect; import org.hibernate.community.dialect.DerbyDialect; @@ -78,12 +79,7 @@ public void prepareTestData() { @AfterEach public void cleanupTestData() { - doInJPA( - this::entityManagerFactory, - entityManager -> { - entityManager.createQuery( "delete from Product" ).executeUpdate(); - } - ); + entityManagerFactory().unwrap(SessionFactory.class).getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/enumeratedvalue/CharEnumerateValueTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/enumeratedvalue/CharEnumerateValueTests.java index bb61aa8c182c..f45c6323ba7d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/enumeratedvalue/CharEnumerateValueTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/enumeratedvalue/CharEnumerateValueTests.java @@ -39,7 +39,6 @@ * * @author Steve Ebersole */ -@SuppressWarnings("JUnitMalformedDeclaration") public class CharEnumerateValueTests { @Test @DomainModel(annotatedClasses = Person.class) @@ -122,7 +121,7 @@ void verifyCheckConstraints2(SessionFactoryScope scope) { @AfterEach void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> session.createMutationQuery( "delete Person" ).executeUpdate() ); + scope.getSessionFactory().getSchemaManager().truncate(); } public enum Gender { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/enumeratedvalue/EnumeratedValueTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/enumeratedvalue/EnumeratedValueTests.java index ab9e699247fc..40822bd7f378 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/enumeratedvalue/EnumeratedValueTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/enumeratedvalue/EnumeratedValueTests.java @@ -112,7 +112,7 @@ void verifyCheckConstraints(SessionFactoryScope scope) { @AfterEach void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> session.createMutationQuery( "delete Person" ).executeUpdate() ); + scope.getSessionFactory().getSchemaManager().truncate(); } public enum Gender { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/enumeratedvalue/NamedEnumEnumerateValueTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/enumeratedvalue/NamedEnumEnumerateValueTests.java index 129f21c929de..2330bcba3e6d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/enumeratedvalue/NamedEnumEnumerateValueTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/enumeratedvalue/NamedEnumEnumerateValueTests.java @@ -129,7 +129,7 @@ void verifyCheckConstraints2(SessionFactoryScope scope) { @AfterEach void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> session.createMutationQuery( "delete Person" ).executeUpdate() ); + scope.getSessionFactory().getSchemaManager().truncate(); } public enum Gender { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/batch/SimpleBatchFetchBaselineTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/batch/SimpleBatchFetchBaselineTests.java index 3632146e049e..2d9a21f78580 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/batch/SimpleBatchFetchBaselineTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/batch/SimpleBatchFetchBaselineTests.java @@ -90,10 +90,7 @@ public void prepareTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createQuery( "delete EmployeeGroup" ).executeUpdate(); - session.createQuery( "delete Employee" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity( name="EmployeeGroup") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/batch/SimpleBatchFetchTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/batch/SimpleBatchFetchTests.java index 84bfee4ea2c8..42fb3c5532f5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/batch/SimpleBatchFetchTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/batch/SimpleBatchFetchTests.java @@ -95,10 +95,7 @@ public void prepareTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createQuery( "delete EmployeeGroup" ).executeUpdate(); - session.createQuery( "delete Employee" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity( name="EmployeeGroup") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SimpleEagerSubSelectFetchTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SimpleEagerSubSelectFetchTests.java index 14f979d22f85..d3edf7906f38 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SimpleEagerSubSelectFetchTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SimpleEagerSubSelectFetchTests.java @@ -119,10 +119,7 @@ public void prepareTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createQuery( "delete Thing" ).executeUpdate(); - session.createQuery( "delete Owner" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity(name = "Owner") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SimpleLazySubSelectFetchTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SimpleLazySubSelectFetchTests.java index 92bca6f45786..d1d186da9961 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SimpleLazySubSelectFetchTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SimpleLazySubSelectFetchTests.java @@ -145,10 +145,7 @@ public void prepareTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createQuery( "delete Thing" ).executeUpdate(); - session.createQuery( "delete Owner" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity(name = "Owner") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SimpleMultipleEagerSubSelectFetchTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SimpleMultipleEagerSubSelectFetchTests.java index e8295d710986..aae5a3186e72 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SimpleMultipleEagerSubSelectFetchTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SimpleMultipleEagerSubSelectFetchTests.java @@ -99,10 +99,7 @@ public void prepareTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createQuery( "delete Thing" ).executeUpdate(); - session.createQuery( "delete Owner" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity(name = "Owner") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SimpleMultipleLazySubSelectFetchTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SimpleMultipleLazySubSelectFetchTests.java index 315cf577bab2..974385169c92 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SimpleMultipleLazySubSelectFetchTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SimpleMultipleLazySubSelectFetchTests.java @@ -143,10 +143,7 @@ public void prepareTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createQuery( "delete Thing" ).executeUpdate(); - session.createQuery( "delete Owner" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity(name = "Owner") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaBasicsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaBasicsTest.java index c7328ec40d9a..7b47362595b8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaBasicsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaBasicsTest.java @@ -83,9 +83,7 @@ void testCriteria(SessionFactoryScope scope) { @AfterEach void tearDown(SessionFactoryScope scope) { - scope.inTransaction( session -> { - session.createQuery( "delete from Account" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity(name = "Account") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaNativeQueryTest.java index 9cd97c5a44d3..214e6f22e344 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaNativeQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaNativeQueryTest.java @@ -50,7 +50,7 @@ void setUp(SessionFactoryScope scope) { @AfterEach void tearDown(SessionFactoryScope scope) { - scope.inTransaction( session -> session.createQuery( "delete from Foo" ).executeUpdate() ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaTests.java index 3429ccb915d5..60eb68273329 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaTests.java @@ -86,9 +86,7 @@ void testCriteria(SessionFactoryScope scope) { @AfterEach void tearDown(SessionFactoryScope scope) { - scope.inTransaction( session -> { - session.createQuery( "delete from Account" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity(name = "Account") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithAliasTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithAliasTest.java index f614883b8d98..75ab3352530c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithAliasTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithAliasTest.java @@ -64,7 +64,7 @@ void testFormulaWithAlias(SessionFactoryScope scope) { @AfterEach void tearDown(SessionFactoryScope scope) { - scope.inTransaction( session -> session.createQuery( "delete from Customer" ).executeUpdate() ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity(name = "Customer") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithPartitionByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithPartitionByTest.java index 38a8c03d3d8e..05565ddeffcc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithPartitionByTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithPartitionByTest.java @@ -75,7 +75,7 @@ void testFormulaAnnotationWithPartitionBy(SessionFactoryScope scope) { @AfterEach void tearDown(SessionFactoryScope scope) { - scope.inTransaction( session -> session.createQuery( "delete from DisplayItem" ).executeUpdate() ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity(name = "DisplayItem") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/ComplexValueGenerationBaselineTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/ComplexValueGenerationBaselineTests.java index dc512e29163d..156d61c3dc76 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/ComplexValueGenerationBaselineTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/ComplexValueGenerationBaselineTests.java @@ -58,7 +58,7 @@ public void testLoading(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> session.createQuery( "delete NonAuditedEntity" ).executeUpdate() ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity( name = "NonAuditedEntity" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/ComplexValueGenerationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/ComplexValueGenerationTests.java index 99d786bc8db8..3b91e7ac5875 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/ComplexValueGenerationTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/ComplexValueGenerationTests.java @@ -128,7 +128,7 @@ public void testGenerations(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> session.createQuery( "delete AuditedEntity" ).executeUpdate() ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity( name = "AuditedEntity" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/DefaultGeneratedValueIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/DefaultGeneratedValueIdentityTest.java index eb2226c52227..363a617dd856 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/DefaultGeneratedValueIdentityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/DefaultGeneratedValueIdentityTest.java @@ -134,7 +134,7 @@ public void testGenerationWithIdentityInsert(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (s) -> s.createQuery( "delete TheEntity" ).executeUpdate() ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity( name = "TheEntity" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/DefaultGeneratedValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/DefaultGeneratedValueTest.java index 61df5eb00e82..ae4a8630827c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/DefaultGeneratedValueTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/DefaultGeneratedValueTest.java @@ -177,7 +177,7 @@ public void testUpdateTimestampGeneration(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (s) -> s.createQuery( "delete TheEntity" ).executeUpdate() ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity( name = "TheEntity" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InDbGenerationsWithAnnotationsTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InDbGenerationsWithAnnotationsTests.java index 64ea16d4abd5..618aeb0a8ba3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InDbGenerationsWithAnnotationsTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InDbGenerationsWithAnnotationsTests.java @@ -82,7 +82,7 @@ public void testGenerations(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> session.createQuery( "delete AuditedEntity" ).executeUpdate() ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity( name = "AuditedEntity" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithAnnotationsTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithAnnotationsTests.java index bdc19843313a..dc9cf4723804 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithAnnotationsTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithAnnotationsTests.java @@ -83,7 +83,7 @@ public void testGenerations(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> session.createQuery( "delete AuditedEntity" ).executeUpdate() ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity( name = "AuditedEntity" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithAnnotationsWithMixedSqlTypesTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithAnnotationsWithMixedSqlTypesTests.java index 631e40cb04b4..5791a6a92e6f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithAnnotationsWithMixedSqlTypesTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithAnnotationsWithMixedSqlTypesTests.java @@ -84,7 +84,7 @@ public void testGenerations(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> session.createQuery( "delete AuditedEntity" ).executeUpdate() ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity( name = "AuditedEntity" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithAnnotationsWithSqlDateTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithAnnotationsWithSqlDateTests.java index 056cdd8eb21e..56cb4a70a6d7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithAnnotationsWithSqlDateTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithAnnotationsWithSqlDateTests.java @@ -83,7 +83,7 @@ public void testGenerations(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> session.createQuery( "delete AuditedEntity" ).executeUpdate() ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity( name = "AuditedEntity" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithMultipleAnnotationsTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithMultipleAnnotationsTests.java index 1635ae3edb8a..7c7b684eeafd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithMultipleAnnotationsTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InVmGenerationsWithMultipleAnnotationsTests.java @@ -84,7 +84,7 @@ public void testGenerations(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> session.createQuery( "delete AuditedEntity" ).executeUpdate() ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity( name = "AuditedEntity" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/SimpleValueGenerationBaselineTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/SimpleValueGenerationBaselineTests.java index e982070e751c..d9fc1869336d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/SimpleValueGenerationBaselineTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/SimpleValueGenerationBaselineTests.java @@ -43,7 +43,7 @@ public void testLoading(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> session.createQuery( "delete NonAuditedEntity" ).executeUpdate() ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity( name = "NonAuditedEntity" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/always/GeneratedAlwaysTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/always/GeneratedAlwaysTest.java index 110b0f155833..e7467d7e91ae 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/always/GeneratedAlwaysTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/always/GeneratedAlwaysTest.java @@ -56,7 +56,7 @@ public void test(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( session -> session.createQuery( "delete WithGeneratedAlways" ).executeUpdate() ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity(name="WithGeneratedAlways") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/formula/FormulaGeneratedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/formula/FormulaGeneratedTest.java index 4dc4a058e064..545cee48e577 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/formula/FormulaGeneratedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/formula/FormulaGeneratedTest.java @@ -69,7 +69,7 @@ public void test(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( session -> session.createQuery( "delete WithDefault" ).executeUpdate() ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity(name="WithDefault") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sql/ImmutableSqlGeneratedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sql/ImmutableSqlGeneratedTest.java index 46dc36ddb950..a7801b6602e2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sql/ImmutableSqlGeneratedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sql/ImmutableSqlGeneratedTest.java @@ -78,7 +78,7 @@ public void test(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( session -> session.createQuery( "delete WithDefault" ).executeUpdate() ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity(name="WithDefault") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sql/SqlGeneratedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sql/SqlGeneratedTest.java index 21a5f6f1aac3..9bd991d7ae40 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sql/SqlGeneratedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sql/SqlGeneratedTest.java @@ -76,7 +76,7 @@ public void test(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( session -> session.createQuery( "delete WithDefault" ).executeUpdate() ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity(name="WithDefault") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/DefaultTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/DefaultTest.java index 2fdcbf36edd1..c36cc1a1754e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/DefaultTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/DefaultTest.java @@ -56,7 +56,7 @@ public void test(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( session -> session.createQuery( "delete WithDefault" ).executeUpdate() ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity(name="WithDefault") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/DynamicDefaultTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/DynamicDefaultTest.java index 9c1a261da735..66886fdab0df 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/DynamicDefaultTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/DynamicDefaultTest.java @@ -81,7 +81,7 @@ public void testWithExplicit(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( session -> session.createQuery( "delete WithDefault" ).executeUpdate() ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity(name="WithDefault") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/ImmutableDefaultTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/ImmutableDefaultTest.java index f259abd7c132..a5fc5cae918d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/ImmutableDefaultTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/ImmutableDefaultTest.java @@ -55,7 +55,7 @@ public void test(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( session -> session.createQuery( "delete WithDefault" ).executeUpdate() ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity(name="WithDefault") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/OverriddenDefaultTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/OverriddenDefaultTest.java index 5d1e4f1b0cae..b19f4979b66c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/OverriddenDefaultTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/OverriddenDefaultTest.java @@ -62,7 +62,7 @@ String getDefault(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( session -> session.createQuery( "delete WithDefault" ).executeUpdate() ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity(name="WithDefault") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/RefreshTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/RefreshTest.java index ac5096c89962..50283b2a4408 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/RefreshTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/RefreshTest.java @@ -57,7 +57,7 @@ public void test(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( session -> session.createQuery( "delete WithDefault" ).executeUpdate() ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity(name="WithDefault") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/MappedSuperclassInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/MappedSuperclassInheritanceTest.java index 2b3031983ee8..03a9cd90b780 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/MappedSuperclassInheritanceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/MappedSuperclassInheritanceTest.java @@ -100,16 +100,7 @@ public void createTestData(SessionFactoryScope scope) { @AfterEach public void cleanupTestData(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "from DomesticCustomer", DomesticCustomer.class ) - .list() - .forEach( cust -> session.remove( cust ) ); - session.createQuery( "from ForeignCustomer", ForeignCustomer.class ) - .list() - .forEach( cust -> session.remove( cust ) ); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @MappedSuperclass diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/MappedSuperclassWithIdOnSubclassesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/MappedSuperclassWithIdOnSubclassesTest.java index 8b9c4c276e3b..c59784d2ec4f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/MappedSuperclassWithIdOnSubclassesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/MappedSuperclassWithIdOnSubclassesTest.java @@ -98,16 +98,7 @@ public void createTestData(SessionFactoryScope scope) { @AfterEach public void cleanupTestData(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "from DomesticCustomer", DomesticCustomer.class ) - .list() - .forEach( cust -> session.remove( cust ) ); - session.createQuery( "from ForeignCustomer", ForeignCustomer.class ) - .list() - .forEach( cust -> session.remove( cust ) ); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @MappedSuperclass diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/SingleTableInheritanceTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/SingleTableInheritanceTests.java index 0b9c152f30a0..2a52adf0fa37 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/SingleTableInheritanceTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/SingleTableInheritanceTests.java @@ -142,16 +142,7 @@ public void createTestData(SessionFactoryScope scope) { @AfterEach public void cleanupTestData(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "from DomesticCustomer", DomesticCustomer.class ).list().forEach( - cust -> session.remove( cust ) - ); - session.createQuery( "from ForeignCustomer", ForeignCustomer.class ).list().forEach( - cust -> session.remove( cust ) - ); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity( name = "Customer" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DiscriminatorQueryUsageTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DiscriminatorQueryUsageTests.java index aca44c8d65ec..5f72f4235450 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DiscriminatorQueryUsageTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DiscriminatorQueryUsageTests.java @@ -101,8 +101,6 @@ public void createTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createQuery( "delete from Person" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DiscriminatorTest.java index a36581921127..75e32b28091c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DiscriminatorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DiscriminatorTest.java @@ -42,10 +42,7 @@ public class DiscriminatorTest { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> - session.createQuery( "delete from Person" ).executeUpdate() - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/JoinedInheritanceEagerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/JoinedInheritanceEagerTest.java index bc0af6a4be27..ae9f1da926e6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/JoinedInheritanceEagerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/JoinedInheritanceEagerTest.java @@ -62,19 +62,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void cleanUp(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - EntityA entityA = session.get( EntityA.class, 4L ); - EntityB entityB = session.get( EntityB.class, 3L ); - EntityD entityD = session.get( EntityD.class, 2L ); - EntityC entityC = session.get( EntityC.class, 1L ); - - session.remove( entityD ); - session.remove( entityC ); - session.remove( entityA ); - session.remove( entityB ); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/SimpleInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/SimpleInheritanceTest.java index d1351b8b4aad..e395d551bd52 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/SimpleInheritanceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/SimpleInheritanceTest.java @@ -37,10 +37,7 @@ public class SimpleInheritanceTest { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> - session.createQuery( "delete from Person" ).executeUpdate() - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/joined/DiscriminatorQueryUsageTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/joined/DiscriminatorQueryUsageTests.java index 3487f7cbd8c2..84f20b7288bf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/joined/DiscriminatorQueryUsageTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/joined/DiscriminatorQueryUsageTests.java @@ -89,8 +89,6 @@ public void createTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createQuery( "delete from ParentEntity" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/dynamic/DynamicJoinedInheritanceTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/dynamic/DynamicJoinedInheritanceTests.java index 3b7db579c32f..97c85d134ccf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/dynamic/DynamicJoinedInheritanceTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/dynamic/DynamicJoinedInheritanceTests.java @@ -61,8 +61,6 @@ public void createTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createQuery( "delete Sub" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceTest.java index b57db9bb3408..4ae561d0f43a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceTest.java @@ -4,7 +4,6 @@ */ package org.hibernate.orm.test.mapping.inheritance.joined; -import java.sql.Statement; import java.util.List; import jakarta.persistence.Entity; import jakarta.persistence.Id; @@ -154,29 +153,7 @@ public void createTestData(SessionFactoryScope scope) { @AfterEach public void cleanupTestData(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.doWork( - work -> { - Statement statement = work.createStatement(); - try { - statement.execute( "delete from DomesticCustomer" ); - statement.execute( "delete from ForeignCustomer" ); - statement.execute( "delete from Customer" ); - } - finally { - statement.close(); - } - } - ); -// session.createQuery( "from DomesticCustomer", DomesticCustomer.class ).list().forEach( -// cust -> session.remove( cust ) -// ); -// session.createQuery( "from ForeignCustomer", ForeignCustomer.class ).list().forEach( -// cust -> session.remove( cust ) -// ); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity(name = "Customer") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceWithConcreteRootTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceWithConcreteRootTest.java index 76aa24de2369..913a0434417f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceWithConcreteRootTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceWithConcreteRootTest.java @@ -4,7 +4,6 @@ */ package org.hibernate.orm.test.mapping.inheritance.joined; -import java.sql.Statement; import java.util.List; import jakarta.persistence.Entity; import jakarta.persistence.Id; @@ -162,23 +161,7 @@ public void createTestData(SessionFactoryScope scope) { @AfterEach public void cleanupTestData(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.doWork( - work -> { - Statement statement = work.createStatement(); - try { - statement.execute( "delete from DomesticCustomer" ); - statement.execute( "delete from ForeignCustomer" ); - statement.execute( "delete from Customer" ); - } - finally { - statement.close(); - } - } - ); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity(name = "Customer") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceWithExplicitDiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceWithExplicitDiscriminatorTest.java index 5a86bc774c24..c8727861b2b4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceWithExplicitDiscriminatorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceWithExplicitDiscriminatorTest.java @@ -4,7 +4,6 @@ */ package org.hibernate.orm.test.mapping.inheritance.joined; -import java.sql.Statement; import java.util.List; import jakarta.persistence.DiscriminatorColumn; import jakarta.persistence.DiscriminatorValue; @@ -121,29 +120,7 @@ public void createTestData(SessionFactoryScope scope) { @AfterEach public void cleanupTestData(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.doWork( - work -> { - Statement statement = work.createStatement(); - try { - statement.execute( "delete from DomesticCustomer" ); - statement.execute( "delete from ForeignCustomer" ); - statement.execute( "delete from Customer" ); - } - finally { - statement.close(); - } - } - ); -// session.createQuery( "from DomesticCustomer", DomesticCustomer.class ).list().forEach( -// cust -> session.remove( cust ) -// ); -// session.createQuery( "from ForeignCustomer", ForeignCustomer.class ).list().forEach( -// cust -> session.remove( cust ) -// ); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity(name = "Customer") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedSubclassTest.java index 24b1757e695c..f7792848c218 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedSubclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedSubclassTest.java @@ -34,13 +34,7 @@ public class JoinedSubclassTest { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete from Employee" ).executeUpdate(); - session.createQuery( "delete from Customer" ).executeUpdate(); - session.createQuery( "delete from Person" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/MixedInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/MixedInheritanceTest.java index 1910f85cd31a..5d1ba08770d9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/MixedInheritanceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/MixedInheritanceTest.java @@ -4,7 +4,6 @@ */ package org.hibernate.orm.test.mapping.inheritance.joined; -import java.sql.Statement; import java.util.List; import jakarta.persistence.DiscriminatorColumn; import jakarta.persistence.DiscriminatorValue; @@ -193,24 +192,7 @@ public void createTestData(SessionFactoryScope scope) { @AfterEach public void cleanupTestData(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.doWork( - work -> { - Statement statement = work.createStatement(); - try { - statement.execute( "delete from DomesticCustomer" ); - statement.execute( "delete from ItalianCustomer" ); - statement.execute( "delete from ForeignCustomer" ); - statement.execute( "delete from Customer" ); - } - finally { - statement.close(); - } - } - ); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity(name = "Customer") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/MixedInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/MixedInheritanceTest.java index 8fe92558d01a..28f96e068e10 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/MixedInheritanceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/MixedInheritanceTest.java @@ -168,13 +168,7 @@ public void createTestData(SessionFactoryScope scope) { @AfterEach public void cleanupTestData(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "from Person", Person.class ).list().forEach( - cust -> session.remove( cust ) - ); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity(name = "Person") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/TablePerClassInheritanceWithAbstractRootTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/TablePerClassInheritanceWithAbstractRootTest.java index 20a1bb9fcf4a..c03a046e0957 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/TablePerClassInheritanceWithAbstractRootTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/TablePerClassInheritanceWithAbstractRootTest.java @@ -147,16 +147,7 @@ public void createTestData(SessionFactoryScope scope) { @AfterEach public void cleanupTestData(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "from DomesticCustomer", DomesticCustomer.class ).list().forEach( - cust -> session.remove( cust ) - ); - session.createQuery( "from ForeignCustomer", ForeignCustomer.class ).list().forEach( - cust -> session.remove( cust ) - ); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity(name = "Customer") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/TablePerClassInheritanceWithConcreteRootTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/TablePerClassInheritanceWithConcreteRootTest.java index 78e648189f7f..cac4128e657a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/TablePerClassInheritanceWithConcreteRootTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/TablePerClassInheritanceWithConcreteRootTest.java @@ -200,13 +200,7 @@ public void createTestData(SessionFactoryScope scope) { @AfterEach public void cleanupTestData(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "from Person", Person.class ).list().forEach( - cust -> session.remove( cust ) - ); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity(name = "Person") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/javatime/GlobalJavaTimeJdbcTypeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/javatime/GlobalJavaTimeJdbcTypeTests.java index b12aee7dbb25..26a874c1629a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/javatime/GlobalJavaTimeJdbcTypeTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/javatime/GlobalJavaTimeJdbcTypeTests.java @@ -205,9 +205,7 @@ void testLocalTime(SessionFactoryScope scope) { @AfterEach void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createMutationQuery( "delete EntityWithJavaTimeValues" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity(name="EntityWithJavaTimeValues") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/javatime/JavaTimeJdbcTypeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/javatime/JavaTimeJdbcTypeTests.java index ff41fc6993a4..80e5eb6ef858 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/javatime/JavaTimeJdbcTypeTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/javatime/JavaTimeJdbcTypeTests.java @@ -206,9 +206,7 @@ void testLocalTime(SessionFactoryScope scope) { @AfterEach void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createMutationQuery( "delete EntityWithJavaTimeValues" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity(name="EntityWithJavaTimeValues") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/InstrumentedLazyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/InstrumentedLazyToOneTest.java index 7ef698c6cf06..eb049fcac5ee 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/InstrumentedLazyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/InstrumentedLazyToOneTest.java @@ -61,12 +61,7 @@ protected void prepareTest(SessionFactoryScope scope) throws Exception { @AfterEach protected void cleanupTestData(SessionFactoryScope scope) throws Exception { - scope.inTransaction( - (session) -> { - session.createMutationQuery( "delete Flight" ).executeUpdate(); - session.createMutationQuery( "delete Airport" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/InstrumentedProxyLazyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/InstrumentedProxyLazyToOneTest.java index 9644a8176993..112642bf6eaf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/InstrumentedProxyLazyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/InstrumentedProxyLazyToOneTest.java @@ -64,12 +64,7 @@ protected void prepareTest(SessionFactoryScope scope) throws Exception { @AfterEach protected void cleanupTestData(SessionFactoryScope scope) throws Exception { - scope.inTransaction( - (session) -> { - session.createMutationQuery( "delete Flight" ).executeUpdate(); - session.createMutationQuery( "delete Airport" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/JoinFetchedManyToOneAllowProxyTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/JoinFetchedManyToOneAllowProxyTests.java index c07cdd6b416e..426a69b739e6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/JoinFetchedManyToOneAllowProxyTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/JoinFetchedManyToOneAllowProxyTests.java @@ -137,12 +137,7 @@ public void createTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( - (session) -> { - session.createQuery( "delete Order" ).executeUpdate(); - session.createQuery( "delete Customer" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity( name = "Customer" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/LanyProxylessManyToOneTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/LanyProxylessManyToOneTests.java index 36a8c03a8246..64e086593352 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/LanyProxylessManyToOneTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/LanyProxylessManyToOneTests.java @@ -187,12 +187,7 @@ public void createTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( - (session) -> { - session.createQuery( "delete Order" ).executeUpdate(); - session.createQuery( "delete Customer" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity( name = "Customer" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/LazyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/LazyToOneTest.java index ef6287b75ab5..e2b10ecefe6d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/LazyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/LazyToOneTest.java @@ -53,12 +53,7 @@ protected void prepareTest() throws Exception { @Override protected void cleanupTestData() throws Exception { - inTransaction( - (session) -> { - session.createQuery( "delete Flight" ).executeUpdate(); - session.createQuery( "delete Airport" ).executeUpdate(); - } - ); + sessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/ManyToOneAllowProxyTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/ManyToOneAllowProxyTests.java index 15e6e8c65de4..bfee32675aed 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/ManyToOneAllowProxyTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/ManyToOneAllowProxyTests.java @@ -145,12 +145,7 @@ public void createTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( - (session) -> { - session.createQuery( "delete Order" ).executeUpdate(); - session.createQuery( "delete Customer" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity( name = "Customer" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/ManyToOneExplicitOptionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/ManyToOneExplicitOptionTests.java index 2e90c5924102..f1123ac7fea1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/ManyToOneExplicitOptionTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/ManyToOneExplicitOptionTests.java @@ -183,12 +183,7 @@ public void createTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( - (session) -> { - session.createQuery( "delete Order" ).executeUpdate(); - session.createQuery( "delete Customer" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity( name = "Customer" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/InitLazyToOneWithinPaddedCollectionInitializationAllowProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/InitLazyToOneWithinPaddedCollectionInitializationAllowProxyTest.java index 1d7098ad2898..53a1983231b2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/InitLazyToOneWithinPaddedCollectionInitializationAllowProxyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/InitLazyToOneWithinPaddedCollectionInitializationAllowProxyTest.java @@ -125,13 +125,7 @@ void afterSessionFactoryBuilt(SessionFactoryScope scope) { @AfterEach void tearDown(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createMutationQuery( "delete from UserAuthorization" ).executeUpdate(); - session.createMutationQuery( "delete from Offer" ).executeUpdate(); - session.createMutationQuery( "delete from CostCenter" ).executeUpdate(); - session.createMutationQuery( "delete from User" ).executeUpdate(); - session.createMutationQuery( "delete from Company" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/mappedby/InverseToOneAllowProxyTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/mappedby/InverseToOneAllowProxyTests.java index bfad23a16e2f..378bd8484b98 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/mappedby/InverseToOneAllowProxyTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/mappedby/InverseToOneAllowProxyTests.java @@ -139,12 +139,7 @@ public void createTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( - (session) -> { - session.createQuery( "delete Customer" ).executeUpdate(); - session.createQuery( "delete SupplementalInfo" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity( name = "Customer" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/mappedby/InverseToOneExplicitOptionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/mappedby/InverseToOneExplicitOptionTests.java index c627cebd4637..a72af71229ff 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/mappedby/InverseToOneExplicitOptionTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/mappedby/InverseToOneExplicitOptionTests.java @@ -157,12 +157,7 @@ public void createTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( - (session) -> { - session.createQuery( "delete Customer" ).executeUpdate(); - session.createQuery( "delete SupplementalInfo" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity( name = "Customer" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/mappedby/JoinFetchedInverseToOneAllowProxyTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/mappedby/JoinFetchedInverseToOneAllowProxyTests.java index e289523df695..34a0b1297ba2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/mappedby/JoinFetchedInverseToOneAllowProxyTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/mappedby/JoinFetchedInverseToOneAllowProxyTests.java @@ -136,12 +136,7 @@ public void createTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( - (session) -> { - session.createQuery( "delete Customer" ).executeUpdate(); - session.createQuery( "delete SupplementalInfo" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity( name = "Customer" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/onetoone/JoinFetchedOneToOneAllowProxyTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/onetoone/JoinFetchedOneToOneAllowProxyTests.java index 1450071c74dd..e9e4dfc7b671 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/onetoone/JoinFetchedOneToOneAllowProxyTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/onetoone/JoinFetchedOneToOneAllowProxyTests.java @@ -120,12 +120,7 @@ public void createTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( - (session) -> { - session.createQuery( "delete SupplementalInfo" ).executeUpdate(); - session.createQuery( "delete Customer" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity( name = "Customer" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/onetoone/LazyProxylessOneToOneTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/onetoone/LazyProxylessOneToOneTests.java index bca39e67606d..108000906b66 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/onetoone/LazyProxylessOneToOneTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/onetoone/LazyProxylessOneToOneTests.java @@ -176,12 +176,7 @@ public void createTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( - (session) -> { - session.createQuery( "delete SupplementalInfo" ).executeUpdate(); - session.createQuery( "delete Customer" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity( name = "Customer" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/onetoone/OneToOneAllowProxyTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/onetoone/OneToOneAllowProxyTests.java index 2ea56e2458e6..f6131a83cc01 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/onetoone/OneToOneAllowProxyTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/onetoone/OneToOneAllowProxyTests.java @@ -140,12 +140,7 @@ public void createTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( - (session) -> { - session.createQuery( "delete SupplementalInfo" ).executeUpdate(); - session.createQuery( "delete Customer" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity( name = "Customer" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/onetoone/OneToOneExplicitOptionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/onetoone/OneToOneExplicitOptionTests.java index fc40e26e518c..2abe8f2059f1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/onetoone/OneToOneExplicitOptionTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/onetoone/OneToOneExplicitOptionTests.java @@ -179,12 +179,7 @@ public void createTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( - (session) -> { - session.createQuery( "delete SupplementalInfo" ).executeUpdate(); - session.createQuery( "delete Customer" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity( name = "Customer" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/polymorphic/JoinFetchedPolymorphicToOneTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/polymorphic/JoinFetchedPolymorphicToOneTests.java index 3034247bc714..1d1fb7006067 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/polymorphic/JoinFetchedPolymorphicToOneTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/polymorphic/JoinFetchedPolymorphicToOneTests.java @@ -107,12 +107,7 @@ public void createTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( - (session) -> { - session.createQuery( "delete Order" ).executeUpdate(); - session.createQuery( "delete Customer" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity( name = "Order" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/polymorphic/PolymorphicToOneExplicitOptionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/polymorphic/PolymorphicToOneExplicitOptionTests.java index ba7de7d7159f..9c67df5c3d37 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/polymorphic/PolymorphicToOneExplicitOptionTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/polymorphic/PolymorphicToOneExplicitOptionTests.java @@ -136,12 +136,7 @@ public void createTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( - (session) -> { - session.createQuery( "delete Order" ).executeUpdate(); - session.createQuery( "delete Customer" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity( name = "Order" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/polymorphic/PolymorphicToOneImplicitOptionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/polymorphic/PolymorphicToOneImplicitOptionTests.java index 51e4e5a72a79..0f2c4d95e2ff 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/polymorphic/PolymorphicToOneImplicitOptionTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/polymorphic/PolymorphicToOneImplicitOptionTests.java @@ -109,12 +109,7 @@ public void createTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( - (session) -> { - session.createQuery( "delete Order" ).executeUpdate(); - session.createQuery( "delete Customer" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity(name = "Order") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyBidirectionalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyBidirectionalTest.java index b082dffabd2b..8f17628be754 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyBidirectionalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyBidirectionalTest.java @@ -67,10 +67,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( session -> { - session.createQuery( "delete from Author" ).executeUpdate(); - session.createQuery( "delete from Book" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyHqlMemberOfQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyHqlMemberOfQueryTest.java index fceb8e8c3480..f323957bd3bb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyHqlMemberOfQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyHqlMemberOfQueryTest.java @@ -106,13 +106,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete from Call" ).executeUpdate(); - session.createQuery( "delete from Person" ).executeUpdate(); - session.createQuery( "delete from Phone" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyUnidirectionalFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyUnidirectionalFetchTest.java index a54fe090a6a7..40245908c984 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyUnidirectionalFetchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyUnidirectionalFetchTest.java @@ -50,12 +50,7 @@ public void setup(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - Event event = session.get( Event.class, 1L ); - session.remove( event ); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/BasicAttributeMutabilityTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/BasicAttributeMutabilityTests.java index 6141cfcbbfc3..5232e0dc3ac3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/BasicAttributeMutabilityTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/BasicAttributeMutabilityTests.java @@ -219,7 +219,7 @@ public void testMutableMerge(SessionFactoryScope scope) { @AfterEach void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> session.createMutationQuery( "delete TheEntity" ).executeUpdate() ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity( name = "TheEntity" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/ImmutabilityMapAsBasicTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/ImmutabilityMapAsBasicTests.java index 864e2a51e3fb..248d6f7f752e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/ImmutabilityMapAsBasicTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/ImmutabilityMapAsBasicTests.java @@ -163,9 +163,7 @@ void createTestData(SessionFactoryScope scope) { @AfterEach void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createMutationQuery( "delete TestEntity" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity( name = "TestEntity" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/ImmutableMapAsBasicTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/ImmutableMapAsBasicTests.java index 91b13b022224..2868e4a92f78 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/ImmutableMapAsBasicTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/ImmutableMapAsBasicTests.java @@ -180,9 +180,7 @@ void createTestData(SessionFactoryScope scope) { @AfterEach void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createMutationQuery( "delete TestEntity" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity( name = "TestEntity" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/MutableMapAsBasicTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/MutableMapAsBasicTests.java index e9a160b12ff2..ff99c7addca1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/MutableMapAsBasicTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/attribute/MutableMapAsBasicTests.java @@ -95,9 +95,7 @@ void createTestData(SessionFactoryScope scope) { @AfterEach void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createMutationQuery( "delete TestEntity" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity( name = "TestEntity" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/converted/ImmutableConvertedBaselineTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/converted/ImmutableConvertedBaselineTests.java index 04aafd0277bd..ab89b2adc7e9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/converted/ImmutableConvertedBaselineTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/converted/ImmutableConvertedBaselineTests.java @@ -189,7 +189,7 @@ void testImmutabilityDetached(SessionFactoryScope scope) { @AfterEach void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> session.createMutationQuery( "delete TheEntity" ).executeUpdate() ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity( name = "TheEntity" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/BasicNaturalIdCachingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/BasicNaturalIdCachingTests.java index 5dc78d2d0d3e..e9684ce967ef 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/BasicNaturalIdCachingTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/BasicNaturalIdCachingTests.java @@ -87,9 +87,7 @@ public void testCreationCaching(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( - (session) -> session.createQuery( "delete CachedEntity" ).executeUpdate() - ); + scope.getSessionFactory().getSchemaManager().truncate(); // make sure the data is not in the L2 cache scope.getSessionFactory().getCache().evictAllRegions(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/CompoundNaturalIdTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/CompoundNaturalIdTests.java index a9c37b7a94a3..fc1e6aed6a7e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/CompoundNaturalIdTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/CompoundNaturalIdTests.java @@ -68,11 +68,7 @@ public void prepareTestData(SessionFactoryScope scope) { @AfterEach public void releaseTestData(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete Account" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/SimpleNaturalIdTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/SimpleNaturalIdTests.java index f1c55d4b6d5a..b01fbc885b98 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/SimpleNaturalIdTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/SimpleNaturalIdTests.java @@ -62,12 +62,7 @@ public void prepareTestData(SessionFactoryScope scope) { @AfterEach public void releaseTestData(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete Product" ).executeUpdate(); - session.createQuery( "delete Vendor" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/AbstractCompositeIdAndNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/AbstractCompositeIdAndNaturalIdTest.java index 5a0bbf9e80cd..38bde5b99788 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/AbstractCompositeIdAndNaturalIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/AbstractCompositeIdAndNaturalIdTest.java @@ -53,11 +53,7 @@ public void prepareTestData(SessionFactoryScope scope) { @AfterEach public void cleanUpTestData(SessionFactoryScope scope) { - scope.inTransaction( - (session) -> { - session.createQuery( "delete Account" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/EmbeddedNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/EmbeddedNaturalIdTest.java index 821d423677b9..8c1901dd0168 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/EmbeddedNaturalIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/EmbeddedNaturalIdTest.java @@ -39,9 +39,7 @@ public void createTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( - (session) -> session.createQuery( "delete PostalCarrier" ).executeUpdate() - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/IdentityGeneratorWithNaturalIdCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/IdentityGeneratorWithNaturalIdCacheTest.java index 5f6edd3e9a61..81703e1af761 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/IdentityGeneratorWithNaturalIdCacheTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/IdentityGeneratorWithNaturalIdCacheTest.java @@ -59,9 +59,7 @@ public void prepareTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( - (session) -> session.createQuery( "delete Person" ).executeUpdate() - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableManyToOneNaturalIdHbmTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableManyToOneNaturalIdHbmTest.java index f7e3c0598ffc..b6a735fe4552 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableManyToOneNaturalIdHbmTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableManyToOneNaturalIdHbmTest.java @@ -60,12 +60,7 @@ public void createTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( - (session) -> { - session.createQuery( "delete Child" ).executeUpdate(); - session.createQuery( "delete Parent" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableNaturalIdTest.java index 013e4de428aa..dbc9efe24f3f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableNaturalIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableNaturalIdTest.java @@ -43,7 +43,7 @@ public class ImmutableNaturalIdTest { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> session.createQuery( "delete User" ).executeUpdate() ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutableentity/ImmutableEntityNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutableentity/ImmutableEntityNaturalIdTest.java index a19762f91a1a..9084184ad17c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutableentity/ImmutableEntityNaturalIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutableentity/ImmutableEntityNaturalIdTest.java @@ -77,9 +77,7 @@ public void createTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( - (session) -> session.createQuery( "delete Building" ).executeUpdate() - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/InheritedNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/InheritedNaturalIdTest.java index 9981395412ff..b9ff6ec7c624 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/InheritedNaturalIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/InheritedNaturalIdTest.java @@ -62,9 +62,7 @@ public void prepareTestData(SessionFactoryScope scope) { @AfterEach public void cleanUpTestData(SessionFactoryScope scope) { - scope.inTransaction( - (session) -> session.createQuery( "delete Principal" ).executeUpdate() - ); + scope.getSessionFactory().getSchemaManager().truncate(); } public static final String ORIGINAL = "steve"; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/cache/InheritedNaturalIdCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/cache/InheritedNaturalIdCacheTest.java index b49e8078b35f..9978cf27eb3f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/cache/InheritedNaturalIdCacheTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/cache/InheritedNaturalIdCacheTest.java @@ -127,8 +127,7 @@ public void createTestData(SessionFactoryScope scope) { @AfterEach public void cleanUpTestData(SessionFactoryScope scope) { - scope.inTransaction( - (session) -> session.createQuery( "delete MyEntity" ).executeUpdate() - ); + scope.getSessionFactory().getSchemaManager().truncate(); + scope.getSessionFactory().getCache().evictAllRegions(); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/cache/InheritedNaturalIdNoCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/cache/InheritedNaturalIdNoCacheTest.java index 194e5a6802be..4d64b7507903 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/cache/InheritedNaturalIdNoCacheTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/cache/InheritedNaturalIdNoCacheTest.java @@ -34,9 +34,7 @@ public void createTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( - (session) -> session.createQuery( "delete MyEntity" ).executeUpdate() - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/lazy/NaturalIdInUninitializedAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/lazy/NaturalIdInUninitializedAssociationTest.java index a09512283734..0266112f7b9c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/lazy/NaturalIdInUninitializedAssociationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/lazy/NaturalIdInUninitializedAssociationTest.java @@ -101,11 +101,7 @@ public void prepareTestData(SessionFactoryScope scope) { @AfterEach public void cleanUpTestData(SessionFactoryScope scope) { - scope.inTransaction( - (session) -> { - session.remove( session.get( AnEntity.class, 3 ) ); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity(name = "AnEntity") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/lazy/NaturalIdInUninitializedProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/lazy/NaturalIdInUninitializedProxyTest.java index 4711e242b922..c5c974ed34a6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/lazy/NaturalIdInUninitializedProxyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/lazy/NaturalIdInUninitializedProxyTest.java @@ -52,12 +52,7 @@ public void prepareTestData(SessionFactoryScope scope) { @AfterEach public void cleanUpTestData(SessionFactoryScope scope) { - scope.inTransaction( - (session) -> { - session.createQuery( "delete from EntityMutableNaturalId" ).executeUpdate(); - session.createQuery( "delete from EntityImmutableNaturalId" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/MutableNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/MutableNaturalIdTest.java index b44a33168a02..7f6201fe6027 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/MutableNaturalIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/MutableNaturalIdTest.java @@ -60,7 +60,7 @@ public void testNaturalIdNullability(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> session.createQuery( "delete User" ).executeUpdate() ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/CachedMutableNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/CachedMutableNaturalIdTest.java index 9345881e0e4d..5f00486dd9c6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/CachedMutableNaturalIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/CachedMutableNaturalIdTest.java @@ -4,7 +4,6 @@ */ package org.hibernate.orm.test.mapping.naturalid.mutable.cached; -import org.hibernate.cache.spi.CacheImplementor; import org.hibernate.internal.SessionFactoryImpl; import org.hibernate.stat.spi.StatisticsImplementor; @@ -27,17 +26,8 @@ public abstract class CachedMutableNaturalIdTest { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( - (session) -> { - session.createMutationQuery( "delete from Another" ).executeUpdate(); - session.createMutationQuery( "delete from AllCached" ).executeUpdate(); - session.createMutationQuery( "delete from SubClass" ).executeUpdate(); - session.createMutationQuery( "delete from A" ).executeUpdate(); - } - ); - - final CacheImplementor cache = scope.getSessionFactory().getCache(); - cache.evictAllRegions(); + scope.getSessionFactory().getSchemaManager().truncate(); + scope.getSessionFactory().getCache().evictAllRegions(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/NullableNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/NullableNaturalIdTest.java index 1031688bdbac..f10c9c3d9b40 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/NullableNaturalIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/NullableNaturalIdTest.java @@ -250,19 +250,6 @@ public void testNaturalIdQuerySupportingNullValues(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( - (session) -> { - session.createQuery( "update A set assC = null" ).executeUpdate(); - session.createQuery( "update B set assA = null" ).executeUpdate(); - session.createQuery( "update D set associatedC = null" ).executeUpdate(); - - session.createQuery( "delete A" ).executeUpdate(); - session.createQuery( "delete B" ).executeUpdate(); - session.createQuery( "delete C" ).executeUpdate(); - session.createQuery( "delete D" ).executeUpdate(); - - session.createQuery( "delete User" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyBidirectionalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyBidirectionalTest.java index cdeca45cf5a6..02b158c6e298 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyBidirectionalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyBidirectionalTest.java @@ -73,10 +73,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( session -> { - session.createQuery( "delete from Item" ).executeUpdate(); - session.createQuery( "delete from Order" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyHqlMemberOfQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyHqlMemberOfQueryTest.java index eda66c1010ca..8e03e6a3442f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyHqlMemberOfQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyHqlMemberOfQueryTest.java @@ -109,13 +109,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete from Call" ).executeUpdate(); - session.createQuery( "delete from Phone" ).executeUpdate(); - session.createQuery( "delete from Person" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManySelfReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManySelfReferenceTest.java index 753d5f5c9ced..997dad3409f9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManySelfReferenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManySelfReferenceTest.java @@ -62,12 +62,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "update Event e set e.parent = null" ).executeUpdate(); - session.createQuery( "delete from Event" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyTest.java index 3b8441ff66f6..28d9f5a7d4d1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyTest.java @@ -62,19 +62,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void cleanUp(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - Card card = session.get( Card.class, CARD_ID ); - card.getFields().forEach( - cardField -> { - Key key = cardField.key; - session.remove( cardField ); - session.remove( key ); - } - ); - session.remove( card ); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneEmbeddedIdSelfReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneEmbeddedIdSelfReferenceTest.java index dcc9275608c1..60383e5f6882 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneEmbeddedIdSelfReferenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneEmbeddedIdSelfReferenceTest.java @@ -38,11 +38,7 @@ public class OneToOneEmbeddedIdSelfReferenceTest { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( session -> { - session.createQuery( "from Tag", Tag.class ).getResultList().forEach( t -> t.setLinkedTag( null ) ); - session.createMutationQuery( "delete from Element" ).executeUpdate(); - session.createMutationQuery( "delete from Tag" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/hhh9798/OneToOneJoinTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/hhh9798/OneToOneJoinTableTest.java index 5ba7383ea6c8..e5b94049dfcf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/hhh9798/OneToOneJoinTableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/hhh9798/OneToOneJoinTableTest.java @@ -60,11 +60,6 @@ public void storeNonUniqueRelationship(SessionFactoryScope scope) { @AfterEach public void cleanUpData(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete Shipment" ).executeUpdate(); - session.createQuery( "delete Item" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/quote/ColumnQuoteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/quote/ColumnQuoteTest.java index d10ed45cef7b..ecddea96314a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/quote/ColumnQuoteTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/quote/ColumnQuoteTest.java @@ -49,9 +49,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( session -> { - session.createQuery( "delete from Product" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/contribution/array/StringArrayContributorTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/contribution/array/StringArrayContributorTests.java index 0e250be1a8d4..73915a7ec3fa 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/contribution/array/StringArrayContributorTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/contribution/array/StringArrayContributorTests.java @@ -86,7 +86,7 @@ public void testParameterInJpaCriteria(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> session.createQuery( "delete Post" ).executeUpdate() ); + scope.getSessionFactory().getSchemaManager().truncate(); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/ZoneMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/ZoneMappingTests.java index 4ac2d189c3e6..ecb0e076a8e7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/ZoneMappingTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/ZoneMappingTests.java @@ -95,7 +95,7 @@ public void testUpdateQuery(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( session -> session.createMutationQuery( "delete ZoneMappingTestEntity" ).executeUpdate() ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity( name = "ZoneMappingTestEntity" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/WhereFragmentTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/WhereFragmentTests.java index 500c010d3f85..2ad619d6dd34 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/WhereFragmentTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/WhereFragmentTests.java @@ -90,11 +90,7 @@ public User findUserByNameUsingHqlFetches(String name, SessionFactoryScope facto @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createNativeMutationQuery( "delete from t_user_skills" ).executeUpdate(); - session.createNativeMutationQuery( "delete t_user_details" ).executeUpdate(); - session.createNativeMutationQuery( "delete t_users" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/merge/CompositeIdWithAssociationsAndGeneratedValuesMergeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/merge/CompositeIdWithAssociationsAndGeneratedValuesMergeTest.java index de0ac09ecf10..bcf7fb413d39 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/merge/CompositeIdWithAssociationsAndGeneratedValuesMergeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/merge/CompositeIdWithAssociationsAndGeneratedValuesMergeTest.java @@ -42,13 +42,7 @@ public class CompositeIdWithAssociationsAndGeneratedValuesMergeTest { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createMutationQuery( "delete from Bottom " ).executeUpdate(); - session.createMutationQuery( "delete from Middle" ).executeUpdate(); - session.createMutationQuery( "delete from Top" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/merge/MergeWithReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/merge/MergeWithReferenceTest.java index 33f58ea78dee..c7216bc1d73d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/merge/MergeWithReferenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/merge/MergeWithReferenceTest.java @@ -36,12 +36,7 @@ public class MergeWithReferenceTest { @AfterEach public void tearDown(SessionFactoryScope scope){ - scope.inTransaction( - session -> { - session.createMutationQuery( "delete from Foo" ).executeUpdate(); - session.createMutationQuery( "delete from Bar" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/NationalizedLobFieldTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/NationalizedLobFieldTest.java index 291fcc6961f8..7025dde9ebaf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/NationalizedLobFieldTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/NationalizedLobFieldTest.java @@ -49,10 +49,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> - session.createQuery( "delete from MyEntity" ).executeUpdate() - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/StringNationalizedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/StringNationalizedTest.java index d1aa677671b0..e08678fbd09c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/StringNationalizedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/StringNationalizedTest.java @@ -44,11 +44,7 @@ public class StringNationalizedTest { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete from NationalizedEntity", null ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/EagerProxyNotFoundTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/EagerProxyNotFoundTest.java index bb44744c8fc3..46a3c86d1840 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/EagerProxyNotFoundTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/EagerProxyNotFoundTest.java @@ -324,12 +324,7 @@ public void testEnityWithNoAssociation(SessionFactoryScope scope) { @AfterEach public void deleteData(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete from Task" ).executeUpdate(); - session.createQuery( "delete from Employee" ).executeUpdate(); - session.createQuery( "delete from Location" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity(name = "Task") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/FkRefTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/FkRefTests.java index 0245d5fc0221..47e1e6b69f20 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/FkRefTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/FkRefTests.java @@ -250,10 +250,7 @@ public void prepareTestData(SessionFactoryScope scope) { @AfterEach public void cleanupTest(SessionFactoryScope scope) throws Exception { - scope.inTransaction( (session) -> { - session.createMutationQuery( "delete Coin" ).executeUpdate(); - session.createMutationQuery( "delete Currency" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity(name = "Coin") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/MutationQueriesAndNotFoundActionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/MutationQueriesAndNotFoundActionTest.java index f59d131a91f0..c622e2678976 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/MutationQueriesAndNotFoundActionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/MutationQueriesAndNotFoundActionTest.java @@ -51,12 +51,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createMutationQuery( "delete from Comment" ).executeUpdate(); - session.createMutationQuery( "delete from User" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OneToOneNotFoundTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OneToOneNotFoundTest.java index ed58151b4094..bed63a754f83 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OneToOneNotFoundTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OneToOneNotFoundTest.java @@ -84,10 +84,7 @@ public void prepareTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createMutationQuery( "delete ShowDescription" ).executeUpdate(); - session.createMutationQuery( "delete Show" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerInEmbeddableNotFoundTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerInEmbeddableNotFoundTest.java index c277782018cc..255b292aee48 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerInEmbeddableNotFoundTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerInEmbeddableNotFoundTest.java @@ -68,27 +68,7 @@ public class OptionalEagerInEmbeddableNotFoundTest { @AfterEach public void cleanUp(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete from " + PersonManyToOneJoinIgnore.class.getName() ) - .executeUpdate(); - session.createQuery( "delete from " + PersonManyToOneSelectIgnore.class.getName() ).executeUpdate(); - session.createQuery( "delete from " + PersonOneToOneJoinIgnore.class.getName() ) - .executeUpdate(); - session.createQuery( "delete from " + PersonOneToOneSelectIgnore.class.getName() ).executeUpdate(); - session.createQuery( "delete from " + PersonMapsIdJoinIgnore.class.getName() ).executeUpdate(); - session.createQuery( "delete from " + PersonMapsIdSelectIgnore.class.getName() ).executeUpdate(); - session.createQuery( "delete from " + PersonPkjcJoinException.class.getName() ).executeUpdate(); - session.createQuery( "delete from " + PersonPkjcJoinIgnore.class.getName() ).executeUpdate(); - session.createQuery( "delete from " + PersonPkjcSelectException.class.getName() ) - .executeUpdate(); - session.createQuery( "delete from " + PersonPkjcSelectIgnore.class.getName() ) - .executeUpdate();session.createQuery( "delete from " + PersonMapsIdColumnJoinIgnore.class.getName() ) - .executeUpdate();session.createQuery( "delete from " + PersonMapsIdColumnSelectIgnore.class.getName() ) - .executeUpdate(); - session.createQuery( "delete from " + City.class.getName() ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerMappedByNotFoundTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerMappedByNotFoundTest.java index f838ca8a2272..e1cc83a88cd7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerMappedByNotFoundTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerMappedByNotFoundTest.java @@ -56,12 +56,7 @@ public class OptionalEagerMappedByNotFoundTest { @AfterEach public void deleteData(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete from Person" ).executeUpdate(); - session.createQuery( "delete from Employment" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerNotFoundTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerNotFoundTest.java index 9e3b22ab1062..3319833b517b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerNotFoundTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerNotFoundTest.java @@ -67,29 +67,7 @@ public class OptionalEagerNotFoundTest { @AfterEach public void cleanUp(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete from " + PersonManyToOneJoinIgnore.class.getName() ) - .executeUpdate(); - session.createQuery( "delete from " + PersonManyToOneSelectIgnore.class.getName() ).executeUpdate(); - session.createQuery( "delete from " + PersonOneToOneJoinIgnore.class.getName() ) - .executeUpdate(); - session.createQuery( "delete from " + PersonOneToOneSelectIgnore.class.getName() ).executeUpdate(); - session.createQuery( "delete from " + PersonMapsIdJoinIgnore.class.getName() ).executeUpdate(); - session.createQuery( "delete from " + PersonMapsIdSelectIgnore.class.getName() ).executeUpdate(); - session.createQuery( "delete from " + PersonPkjcJoinException.class.getName() ).executeUpdate(); - session.createQuery( "delete from " + PersonPkjcJoinIgnore.class.getName() ).executeUpdate(); - session.createQuery( "delete from " + PersonPkjcSelectException.class.getName() ) - .executeUpdate(); - session.createQuery( "delete from " + PersonPkjcSelectIgnore.class.getName() ) - .executeUpdate(); - session.createQuery( "delete from " + PersonMapsIdColumnJoinIgnore.class.getName() ) - .executeUpdate(); - session.createQuery( "delete from " + PersonMapsIdColumnSelectIgnore.class.getName() ) - .executeUpdate(); - session.createQuery( "delete from " + City.class.getName() ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerRefNonPKNotFoundTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerRefNonPKNotFoundTest.java index e79c915ae966..d5d5635971ac 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerRefNonPKNotFoundTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalEagerRefNonPKNotFoundTest.java @@ -69,27 +69,7 @@ public class OptionalEagerRefNonPKNotFoundTest { @AfterEach public void cleanUp(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete from " + PersonManyToOneJoinIgnore.class.getName() ) - .executeUpdate(); - session.createQuery( "delete from " + PersonManyToOneSelectIgnore.class.getName() ).executeUpdate(); - session.createQuery( "delete from " + PersonOneToOneJoinIgnore.class.getName() ) - .executeUpdate(); - session.createQuery( "delete from " + PersonOneToOneSelectIgnore.class.getName() ).executeUpdate(); - session.createQuery( "delete from " + PersonMapsIdJoinIgnore.class.getName() ).executeUpdate(); - session.createQuery( "delete from " + PersonMapsIdSelectIgnore.class.getName() ).executeUpdate(); - session.createQuery( "delete from " + PersonPkjcJoinException.class.getName() ).executeUpdate(); - session.createQuery( "delete from " + PersonPkjcJoinIgnore.class.getName() ).executeUpdate(); - session.createQuery( "delete from " + PersonPkjcSelectException.class.getName() ) - .executeUpdate(); - session.createQuery( "delete from " + PersonPkjcSelectIgnore.class.getName() ) - .executeUpdate();session.createQuery( "delete from " + PersonMapsIdColumnJoinIgnore.class.getName() ) - .executeUpdate();session.createQuery( "delete from " + PersonMapsIdColumnSelectIgnore.class.getName() ) - .executeUpdate(); - session.createQuery( "delete from " + City.class.getName() ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalLazyNotFoundTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalLazyNotFoundTest.java index c17fe9a7b053..96db803b86a5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalLazyNotFoundTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/OptionalLazyNotFoundTest.java @@ -71,25 +71,7 @@ public class OptionalLazyNotFoundTest { @AfterEach public void cleanUp(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete from " + PersonManyToOneSelectException.class.getName() ) - .executeUpdate(); - session.createQuery( "delete from " + PersonManyToOneSelectIgnore.class.getName() ).executeUpdate(); - session.createQuery( "delete from " + PersonOneToOneSelectException.class.getName() ) - .executeUpdate(); - session.createQuery( "delete from " + PersonOneToOneSelectIgnore.class.getName() ).executeUpdate(); - session.createQuery( "delete from " + PersonMapsIdSelectException.class.getName() ).executeUpdate(); - session.createQuery( "delete from " + PersonMapsIdSelectIgnore.class.getName() ).executeUpdate(); - session.createQuery( "delete from " + PersonPkjcSelectException.class.getName() ).executeUpdate(); - session.createQuery( "delete from " + PersonPkjcSelectIgnore.class.getName() ).executeUpdate(); - session.createQuery( "delete from " + PersonMapsIdColumnSelectIgnore.class.getName() ) - .executeUpdate(); - session.createQuery( "delete from " + PersonMapsIdColumnSelectException.class.getName() ) - .executeUpdate(); - session.createQuery( "delete from " + City.class.getName() ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/RequiredLazyNotFoundTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/RequiredLazyNotFoundTest.java index 52feb54a9a83..f64e69cef1e9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/RequiredLazyNotFoundTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/RequiredLazyNotFoundTest.java @@ -62,19 +62,7 @@ public class RequiredLazyNotFoundTest { @AfterEach public void cleanUp(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete from " + PersonManyToOneSelectException.class.getName() ) - .executeUpdate(); - session.createQuery( "delete from " + PersonOneToOneSelectException.class.getName() ) - .executeUpdate(); - session.createQuery( "delete from " + PersonMapsIdSelectException.class.getName() ).executeUpdate(); - session.createQuery( "delete from " + PersonPkjcSelectException.class.getName() ).executeUpdate(); - session.createQuery( "delete from " + PersonMapsIdColumnSelectException.class.getName() ) - .executeUpdate(); - session.createQuery( "delete from " + City.class.getName() ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/exception/NotFoundExceptionLogicalOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/exception/NotFoundExceptionLogicalOneToOneTest.java index 23fdd3a18220..3a2e2519f618 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/exception/NotFoundExceptionLogicalOneToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/exception/NotFoundExceptionLogicalOneToOneTest.java @@ -291,10 +291,7 @@ public void prepareTestData(SessionFactoryScope scope) { @AfterEach public void cleanupTest(SessionFactoryScope scope) throws Exception { - scope.inTransaction( (session) -> { - session.createMutationQuery( "delete Coin" ).executeUpdate(); - session.createMutationQuery( "delete Currency" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity(name = "Coin") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/exception/NotFoundExceptionManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/exception/NotFoundExceptionManyToOneTest.java index 81bbdc6a4f65..0512fb1a0ca1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/exception/NotFoundExceptionManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/exception/NotFoundExceptionManyToOneTest.java @@ -277,10 +277,7 @@ public void prepareTestData(SessionFactoryScope scope) { @AfterEach public void cleanupTest(SessionFactoryScope scope) throws Exception { - scope.inTransaction( (session) -> { - session.createMutationQuery( "delete Coin" ).executeUpdate(); - session.createMutationQuery( "delete Currency" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity(name = "Coin") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/exception/NotFoundExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/exception/NotFoundExceptionTest.java index d7fa431e7928..cf3dacbd2897 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/exception/NotFoundExceptionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/exception/NotFoundExceptionTest.java @@ -43,10 +43,7 @@ public class NotFoundExceptionTest { @AfterEach public void setUp(SessionFactoryScope scope) { - scope.inTransaction( - session -> - session.createNativeMutationQuery( "delete from CHESS_GAME" ).executeUpdate() - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/ignore/NotFoundIgnoreManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/ignore/NotFoundIgnoreManyToOneTest.java index 15aa35267a98..cdb16e49d1d1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/ignore/NotFoundIgnoreManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/ignore/NotFoundIgnoreManyToOneTest.java @@ -256,10 +256,7 @@ protected void prepareTestData(SessionFactoryScope scope) { @AfterEach protected void dropTestData(SessionFactoryScope scope) throws Exception { - scope.inTransaction( (session) -> { - session.createMutationQuery( "delete Coin" ).executeUpdate(); - session.createMutationQuery( "delete Currency" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity(name = "Coin") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/ignore/NotFoundIgnoreOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/ignore/NotFoundIgnoreOneToOneTest.java index 742323fb3b1c..615722af5c35 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/ignore/NotFoundIgnoreOneToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/ignore/NotFoundIgnoreOneToOneTest.java @@ -256,10 +256,7 @@ public void prepareTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createMutationQuery( "delete Coin" ).executeUpdate(); - session.createMutationQuery( "delete Currency" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity(name = "Coin") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/OnDeleteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/OnDeleteTest.java index 3be130c74dda..56ac6b710e53 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/OnDeleteTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/OnDeleteTest.java @@ -35,13 +35,7 @@ public class OnDeleteTest { @AfterEach public void tearDown(SessionFactoryScope scope){ - scope.inTransaction( - session -> { - session.createQuery( "delete from Salesperson" ).executeUpdate(); - session.createQuery( "delete from Employee" ).executeUpdate(); - session.createQuery( "delete from Person" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/toone/hbm/ToOneOnDeleteHbmTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/toone/hbm/ToOneOnDeleteHbmTest.java index 0e1d5d3f4be6..146524be6e83 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/toone/hbm/ToOneOnDeleteHbmTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/toone/hbm/ToOneOnDeleteHbmTest.java @@ -25,13 +25,7 @@ public class ToOneOnDeleteHbmTest { @AfterEach public void tearDown(SessionFactoryScope scope){ - scope.inTransaction( - session -> { - session.createQuery( "delete from Parent" ).executeUpdate(); - session.createQuery( "delete from Child" ).executeUpdate(); - session.createQuery( "delete from GrandChild" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/LazyLoadingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/LazyLoadingTest.java index cbde91eb7343..de7f341ace9d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/LazyLoadingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/LazyLoadingTest.java @@ -65,12 +65,7 @@ public void setUpData(SessionFactoryScope scope) { @AfterEach public void cleanUpData(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.remove( session.get( Store.class, 1 ) ); - session.remove( session.get( Product.class, "007" ) ); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/cache/CacheLazyLoadNoTransTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/cache/CacheLazyLoadNoTransTest.java index f8cec7c3ab01..1122780f8d89 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/cache/CacheLazyLoadNoTransTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/cache/CacheLazyLoadNoTransTest.java @@ -70,13 +70,7 @@ public class CacheLazyLoadNoTransTest { @AfterEach public void tearDown(SessionFactoryScope scope){ - scope.inTransaction( - session -> { - session.createQuery( "delete from Application" ).executeUpdate(); - session.createQuery( "delete from Item" ).executeUpdate(); - session.createQuery( "delete from Customer" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/OneToManyDuplicateInsertionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/OneToManyDuplicateInsertionTest.java index 229df10d23b4..aed27187c5c2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/OneToManyDuplicateInsertionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/OneToManyDuplicateInsertionTest.java @@ -36,12 +36,7 @@ public class OneToManyDuplicateInsertionTest { @AfterEach public void tearDown(EntityManagerFactoryScope scope) { - scope.inTransaction( - entityManager -> { - entityManager.createQuery( "delete from Child" ).executeUpdate(); - entityManager.createQuery( "delete from Parent" ).executeUpdate(); - } - ); + scope.getEntityManagerFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/joined/MappedSuperclassMapTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/joined/MappedSuperclassMapTest.java index 1312de3a82f7..8080bd4d3b0f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/joined/MappedSuperclassMapTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/joined/MappedSuperclassMapTest.java @@ -124,10 +124,7 @@ public void breakReferences(SessionFactoryScope scope) { @AfterEach protected void cleanupTestData(SessionFactoryScope scope) throws Exception { - scope.inTransaction( sess -> { - sess.createQuery( "delete from Book" ).executeUpdate(); - sess.createQuery( "delete from Library" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/perclass/MappedSuperclassMapTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/perclass/MappedSuperclassMapTest.java index 97ee7ef16e56..7f47428efe8c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/perclass/MappedSuperclassMapTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/perclass/MappedSuperclassMapTest.java @@ -122,9 +122,6 @@ public void breakReferences(SessionFactoryScope scope) { @AfterEach protected void cleanupTestData(SessionFactoryScope scope) throws Exception { - scope.inTransaction( sess -> { - sess.createQuery( "delete from Book" ).executeUpdate(); - sess.createQuery( "delete from Library" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/single/MappedSuperclassMapTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/single/MappedSuperclassMapTest.java index 84b80186c545..287f67950806 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/single/MappedSuperclassMapTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/inheritance/single/MappedSuperclassMapTest.java @@ -121,10 +121,7 @@ public void breakReferences(SessionFactoryScope scope) { @AfterEach protected void cleanupTestData(SessionFactoryScope scope) throws Exception { - scope.inTransaction( sess -> { - sess.createQuery( "delete from Book" ).executeUpdate(); - sess.createQuery( "delete from Library" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/bidirectional/BiDirectionalOneToOneFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/bidirectional/BiDirectionalOneToOneFetchTest.java index 9689afb9bab5..9ea206ed154c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/bidirectional/BiDirectionalOneToOneFetchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/bidirectional/BiDirectionalOneToOneFetchTest.java @@ -43,11 +43,7 @@ public class BiDirectionalOneToOneFetchTest { @AfterEach public void delete(SessionFactoryScope scope) { - scope.inTransaction( s -> { - s.createQuery( "delete from EntityA" ).executeUpdate(); - s.createQuery( "delete from EntityB" ).executeUpdate(); - s.createQuery( "delete from EntityC" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/flush/DirtyFlushTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/flush/DirtyFlushTest.java index 739ddd34995f..2ce1cc8e0d17 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/flush/DirtyFlushTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/flush/DirtyFlushTest.java @@ -74,10 +74,7 @@ public void testDirtyFlushNotHappened(EntityManagerFactoryScope scope) { @AfterEach public void tearDown(EntityManagerFactoryScope scope) { - scope.inTransaction( em -> { - em.createQuery( "delete from Profile" ).executeUpdate(); - em.createQuery( "delete from User" ).executeUpdate(); - } ); + scope.getEntityManagerFactory().getSchemaManager().truncate(); } @Entity(name = "User") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/JoinedSubclassOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/JoinedSubclassOneToOneTest.java index 6fd8ce4bcdb3..5cd396c57328 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/JoinedSubclassOneToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/JoinedSubclassOneToOneTest.java @@ -38,14 +38,7 @@ public class JoinedSubclassOneToOneTest { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete from Address" ).executeUpdate(); - session.createQuery( "delete from MailingAddress" ).executeUpdate(); - session.createQuery( "delete from Person" ).executeUpdate(); - session.createQuery( "delete from Org" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/DiscrimSubclassOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/DiscrimSubclassOneToOneTest.java index f11694913ee8..db7d5eb68486 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/DiscrimSubclassOneToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/DiscrimSubclassOneToOneTest.java @@ -38,14 +38,7 @@ public class DiscrimSubclassOneToOneTest { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete from Address" ).executeUpdate(); - session.createQuery( "delete from MailingAddress" ).executeUpdate(); - session.createQuery( "delete from Person" ).executeUpdate(); - session.createQuery( "delete from Org" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/SingleTableOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/SingleTableOneToOneTest.java index 749d7a69e949..48ec54686eb4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/SingleTableOneToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/SingleTableOneToOneTest.java @@ -51,14 +51,7 @@ public class SingleTableOneToOneTest { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createMutationQuery( "delete from SubClass2" ).executeUpdate(); - session.createMutationQuery( "delete from SubClass1" ).executeUpdate(); - session.createMutationQuery( "delete from Container1" ).executeUpdate(); - session.createMutationQuery( "delete from Container2" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/EnumsParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/EnumsParameterTest.java index 7c5d90327ecf..5a53e9de51b7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/EnumsParameterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/EnumsParameterTest.java @@ -57,12 +57,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createMutationQuery( "delete from Event" ).executeUpdate(); - session.createMutationQuery( "delete from Organizer" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeTest.java index ddd875e8ea8b..c9527f510f4e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeTest.java @@ -828,26 +828,6 @@ public void testMergeManyToManyWithCollectionDeference(SessionFactoryScope scope @AfterEach public void cleanup(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete from NumberedNode where parent is not null" ).executeUpdate(); - session.createQuery( "delete from NumberedNode" ).executeUpdate(); - - session.createQuery( "delete from Node where parent is not null" ).executeUpdate(); - session.createQuery( "delete from Node" ).executeUpdate(); - - session.createQuery( "delete from VersionedEntity where parent is not null" ).executeUpdate(); - session.createQuery( "delete from VersionedEntity" ).executeUpdate(); - session.createQuery( "delete from TimestampedEntity" ).executeUpdate(); - - session.createQuery( "delete from Competitor" ).executeUpdate(); - session.createQuery( "delete from Competition" ).executeUpdate(); - - for ( Employer employer : (List) session.createQuery( "from Employer" ).list() ) { - session.remove( employer ); - } - } - ); - + scope.getSessionFactory().getSchemaManager().truncate(); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/OneToManyMappedByCascadeDeleteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/OneToManyMappedByCascadeDeleteTest.java index 4c45da04009d..90fe4a95f3f9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/OneToManyMappedByCascadeDeleteTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/OneToManyMappedByCascadeDeleteTest.java @@ -36,10 +36,7 @@ public class OneToManyMappedByCascadeDeleteTest { @AfterEach public void cleanup(SessionFactoryScope scope) { - scope.inTransaction( s -> { - s.createMutationQuery( "delete from child" ).executeUpdate(); - s.createMutationQuery( "delete from parent" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/OneToManyMappedByOrderColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/OneToManyMappedByOrderColumnTest.java index a6212d73d6d3..9ab7735b30c0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/OneToManyMappedByOrderColumnTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/OneToManyMappedByOrderColumnTest.java @@ -36,10 +36,7 @@ public class OneToManyMappedByOrderColumnTest { @AfterEach public void cleanup(SessionFactoryScope scope) { - scope.inTransaction( s -> { - s.createMutationQuery( "delete from child" ).executeUpdate(); - s.createMutationQuery( "delete from parent" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/OptimisticLockTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/OptimisticLockTest.java index aa3451406918..ee5c07634e32 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/OptimisticLockTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/OptimisticLockTest.java @@ -45,14 +45,7 @@ public class OptimisticLockTest { @AfterEach public void tearDown(SessionFactoryScope scope){ - scope.inTransaction( - session -> - { - session.createQuery( "delete from LockDirty" ).executeUpdate(); - session.createQuery( "delete from LockAll" ).executeUpdate(); - } - ); - + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/OptimisticLockWithGloballyQuotedIdentifierTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/OptimisticLockWithGloballyQuotedIdentifierTest.java index da55f2740ade..3162d97509e0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/OptimisticLockWithGloballyQuotedIdentifierTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/OptimisticLockWithGloballyQuotedIdentifierTest.java @@ -45,11 +45,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete from Person" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/OptimisticLockWithQuotedVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/OptimisticLockWithQuotedVersionTest.java index 54ea0700730b..25db7cf8e9eb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/OptimisticLockWithQuotedVersionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/OptimisticLockWithQuotedVersionTest.java @@ -36,11 +36,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete from Person" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/OrderByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/OrderByTest.java index e0665d931ab2..6fe40b652a42 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/OrderByTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/OrderByTest.java @@ -90,15 +90,7 @@ protected void prepareTest(SessionFactoryScope scope) { @AfterEach protected void cleanupTest(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createMutationQuery( "delete from Person" ).executeUpdate(); - session.createMutationQuery( "delete from TaskVersion" ).executeUpdate(); - session.createMutationQuery( "delete from UUser" ).executeUpdate(); - session.createMutationQuery( "delete from GGroup" ).executeUpdate(); - session.createMutationQuery( "delete from Task" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/OrderByToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/OrderByToOneTest.java index 3670db9a9eda..b5b364da1512 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/OrderByToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/OrderByToOneTest.java @@ -71,13 +71,7 @@ protected void prepareTest(SessionFactoryScope scope) { @AfterEach protected void cleanupTest(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createMutationQuery( "delete from TaskVersion" ).executeUpdate(); - session.createMutationQuery( "delete from UUser" ).executeUpdate(); - session.createMutationQuery( "delete from Task" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ordered/OrderByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ordered/OrderByTest.java index d2640be65ed8..4f46890948c3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ordered/OrderByTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ordered/OrderByTest.java @@ -34,10 +34,7 @@ public class OrderByTest { @AfterEach public void tearDonw(SessionFactoryScope scope){ - scope.inTransaction( - session -> - session.createQuery( "delete from Search" ).executeUpdate() - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/OrphanTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/OrphanTest.java index 964ba576a8a9..c371801cacd3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/OrphanTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/OrphanTest.java @@ -30,12 +30,7 @@ public class OrphanTest { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete from Part" ).executeUpdate(); - session.createQuery( "delete from Product" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/PropertyRefTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/PropertyRefTest.java index 4c42c495c944..101e61ac7189 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/PropertyRefTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/PropertyRefTest.java @@ -27,12 +27,7 @@ public class PropertyRefTest { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete from Mail" ).executeUpdate(); - session.createQuery( "delete from User" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/elementcollection/ElementCollectionOrphanTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/elementcollection/ElementCollectionOrphanTest.java index 1187077bd483..b4a2a275a45b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/elementcollection/ElementCollectionOrphanTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/elementcollection/ElementCollectionOrphanTest.java @@ -22,13 +22,7 @@ public class ElementCollectionOrphanTest { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete from Student" ).executeUpdate(); - session.createQuery( "delete from EnrollableClass" ).executeUpdate(); - session.createQuery( "delete from EnrolledClassSeat" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/manytomany/ManyToManyOrphanTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/manytomany/ManyToManyOrphanTest.java index 9d1a17e32a8a..001490478def 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/manytomany/ManyToManyOrphanTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/manytomany/ManyToManyOrphanTest.java @@ -25,12 +25,7 @@ public class ManyToManyOrphanTest { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete from User" ).executeUpdate(); - session.createQuery( "delete from Group" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneEagerNonOptionalOrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneEagerNonOptionalOrphanRemovalTest.java index e82df8018def..51242121f482 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneEagerNonOptionalOrphanRemovalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneEagerNonOptionalOrphanRemovalTest.java @@ -34,13 +34,7 @@ public class OneToOneEagerNonOptionalOrphanRemovalTest { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete from Car" ).executeUpdate(); - session.createQuery( "delete from Engine" ).executeUpdate(); - session.createQuery( "delete from PaintColor" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneEagerOrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneEagerOrphanRemovalTest.java index d45cc743d5f3..0f88e8f0e844 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneEagerOrphanRemovalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneEagerOrphanRemovalTest.java @@ -34,13 +34,7 @@ public class OneToOneEagerOrphanRemovalTest { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete from Car" ).executeUpdate(); - session.createQuery( "delete from Engine" ).executeUpdate(); - session.createQuery( "delete from PaintColor" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneLazyNonOptionalOrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneLazyNonOptionalOrphanRemovalTest.java index 350cf2d174d1..ff88f7fb7cd6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneLazyNonOptionalOrphanRemovalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneLazyNonOptionalOrphanRemovalTest.java @@ -35,13 +35,7 @@ public class OneToOneLazyNonOptionalOrphanRemovalTest { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createMutationQuery( "delete from Car" ).executeUpdate(); - session.createMutationQuery( "delete from Engine" ).executeUpdate(); - session.createMutationQuery( "delete from PaintColor" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneLazyOrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneLazyOrphanRemovalTest.java index 5038e2e31ade..d07ea61d0532 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneLazyOrphanRemovalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneLazyOrphanRemovalTest.java @@ -34,13 +34,7 @@ public class OneToOneLazyOrphanRemovalTest { @AfterEach public void tearDown(SessionFactoryScope scope){ - scope.inTransaction( - session -> { - session.createQuery( "delete from PaintColor" ).executeUpdate(); - session.createQuery( "delete from Engine" ).executeUpdate(); - session.createQuery( "delete from Car" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneProxyOrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneProxyOrphanRemovalTest.java index a25d75ae9ffc..1e4a89fa2dbe 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneProxyOrphanRemovalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneProxyOrphanRemovalTest.java @@ -41,12 +41,7 @@ public class OneToOneProxyOrphanRemovalTest { @AfterEach public void tearDown(EntityManagerFactoryScope scope){ - scope.inTransaction( - entityManager -> { - entityManager.createQuery( "delete from Parent" ).executeUpdate(); - entityManager.createQuery( "delete from Child" ).executeUpdate(); - } - ); + scope.getEntityManagerFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/DeleteOneToOneOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/DeleteOneToOneOrphansTest.java index 212b15bccc56..fdde6c4618bc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/DeleteOneToOneOrphansTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/DeleteOneToOneOrphansTest.java @@ -40,12 +40,7 @@ public void createData(SessionFactoryScope scope) { @AfterEach public void cleanupData(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete EmployeeInfo" ).executeUpdate(); - session.createQuery( "delete Employee" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/DeleteMultiLevelOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/DeleteMultiLevelOrphansTest.java index 9f20c8c2b674..43740bbf048e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/DeleteMultiLevelOrphansTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/DeleteMultiLevelOrphansTest.java @@ -70,13 +70,7 @@ public void createData(SessionFactoryScope scope) { @AfterEach public void cleanupData(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete Tranche" ).executeUpdate(); - session.createQuery( "delete Tranchenmodell" ).executeUpdate(); - session.createQuery( "delete Preisregelung" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/composite/DeleteOneToOneOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/composite/DeleteOneToOneOrphansTest.java index 16f5c3f27c70..e0da50b271f8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/composite/DeleteOneToOneOrphansTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/composite/DeleteOneToOneOrphansTest.java @@ -40,12 +40,7 @@ public void createData(SessionFactoryScope scope) { @AfterEach public void cleanupData(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete Employee" ).executeUpdate(); - session.createQuery( "delete EmployeeInfo" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/DeleteOneToOneOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/DeleteOneToOneOrphansTest.java index 6a39b8883705..5e2aef921de8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/DeleteOneToOneOrphansTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/DeleteOneToOneOrphansTest.java @@ -40,12 +40,7 @@ public void createData(SessionFactoryScope scope) { @AfterEach public void cleanupData(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete Employee" ).executeUpdate(); - session.createQuery( "delete EmployeeInfo" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/multilevelcascade/DeleteMultiLevelOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/multilevelcascade/DeleteMultiLevelOrphansTest.java index 01913d2b787e..d59549dc138a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/multilevelcascade/DeleteMultiLevelOrphansTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/multilevelcascade/DeleteMultiLevelOrphansTest.java @@ -62,13 +62,7 @@ public void createData(SessionFactoryScope scope) { @AfterEach public void cleanupData(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete Tranche" ).executeUpdate(); - session.createQuery( "delete Preisregelung" ).executeUpdate(); - session.createQuery( "delete Tranchenmodell" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/unidirectional/DeleteOneToOneOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/unidirectional/DeleteOneToOneOrphansTest.java index e7d05e81fb6e..5018c7a549ba 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/unidirectional/DeleteOneToOneOrphansTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/unidirectional/DeleteOneToOneOrphansTest.java @@ -40,12 +40,7 @@ public void createData(SessionFactoryScope scope) { @AfterEach public void cleanupData(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete Employee" ).executeUpdate(); - session.createQuery( "delete EmployeeInfo" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/pk/bidirectional/DeleteOneToOneOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/pk/bidirectional/DeleteOneToOneOrphansTest.java index ab36fe70e6a8..35be836cbfbb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/pk/bidirectional/DeleteOneToOneOrphansTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/pk/bidirectional/DeleteOneToOneOrphansTest.java @@ -39,12 +39,7 @@ public void createData(SessionFactoryScope scope) { @AfterEach public void cleanupData(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete EmployeeInfo" ).executeUpdate(); - session.createQuery( "delete Employee" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/pk/unidirectional/DeleteOneToOneOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/pk/unidirectional/DeleteOneToOneOrphansTest.java index 00b1a0bf0d2e..e2fc4f350942 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/pk/unidirectional/DeleteOneToOneOrphansTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/pk/unidirectional/DeleteOneToOneOrphansTest.java @@ -40,12 +40,7 @@ public void createData(SessionFactoryScope scope) { @AfterEach public void cleanupData(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete EmployeeInfo" ).executeUpdate(); - session.createQuery( "delete Employee" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/onetomany/DeleteOneToManyOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/onetomany/DeleteOneToManyOrphansTest.java index c25cbfae50c2..209b155ed9c0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/onetomany/DeleteOneToManyOrphansTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/onetomany/DeleteOneToManyOrphansTest.java @@ -46,12 +46,7 @@ public void createData(SessionFactoryScope scope) { @AfterEach public void cleanupData(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete Feature" ).executeUpdate(); - session.createQuery( "delete Product" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/FetchClausePaginationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/FetchClausePaginationTest.java index 366d637b224d..d5cd98053cd5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/FetchClausePaginationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/FetchClausePaginationTest.java @@ -60,12 +60,7 @@ public void createTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete from EntityOfLists" ).executeUpdate(); - session.createQuery( "delete from SimpleEntity" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/OraclePaginationWithLocksTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/OraclePaginationWithLocksTest.java index 5224b7bd07fe..ce859083383a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/OraclePaginationWithLocksTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/OraclePaginationWithLocksTest.java @@ -56,11 +56,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> - session.createQuery( "delete from Person" ).executeUpdate() - - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/PaginationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/PaginationTest.java index ed10079dc7fb..c93cec56ae66 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/PaginationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/PaginationTest.java @@ -217,8 +217,6 @@ public void prepareTestData(SessionFactoryScope scope) { @AfterEach public void cleanupTestData(SessionFactoryScope scope) { - scope.inTransaction( - session -> session.createMutationQuery( "delete from DataPoint" ).executeUpdate() - ); + scope.getSessionFactory().getSchemaManager().truncate(); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/SubqueryPaginationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/SubqueryPaginationTest.java index c2933429309b..f37b9b9400a7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/SubqueryPaginationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/SubqueryPaginationTest.java @@ -62,12 +62,7 @@ public void createTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete from EntityOfLists" ).executeUpdate(); - session.createQuery( "delete from SimpleEntity" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/discrim/SubclassPropertyRefTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/discrim/SubclassPropertyRefTest.java index 02769b54f656..44456263761b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/discrim/SubclassPropertyRefTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/discrim/SubclassPropertyRefTest.java @@ -46,12 +46,7 @@ public void setUp(SessionFactoryScope scope){ @AfterEach public void tearDown(SessionFactoryScope scope){ - scope.inTransaction( - session -> { - session.createQuery( "delete from Account" ).executeUpdate(); - session.createQuery( "delete from Person" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/union/UnionSubclassPropertyRefTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/union/UnionSubclassPropertyRefTest.java index 6038ed4fd812..1f0d2f8cd180 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/union/UnionSubclassPropertyRefTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/union/UnionSubclassPropertyRefTest.java @@ -47,13 +47,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete from Account" ).executeUpdate(); - session.createQuery( "delete from Person" ).executeUpdate(); - session.createQuery( "delete from Customer" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/HibernateUnproxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/HibernateUnproxyTest.java index ea4b95a23ec0..a38ad82b7add 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/HibernateUnproxyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/HibernateUnproxyTest.java @@ -32,13 +32,7 @@ public class HibernateUnproxyTest { @AfterEach public void tearDown(EntityManagerFactoryScope scope){ - scope.inTransaction( - entityManager -> { - entityManager.createQuery( "update Parent p set p.child = null" ).executeUpdate(); - entityManager.createQuery( "delete from Child" ).executeUpdate(); - entityManager.createQuery( "delete from Parent" ).executeUpdate(); - } - ); + scope.getEntityManagerFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/ProxyReferenceEqualityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/ProxyReferenceEqualityTest.java index 853ad8eff7a9..85628ac80b4e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/ProxyReferenceEqualityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/ProxyReferenceEqualityTest.java @@ -37,12 +37,7 @@ public class ProxyReferenceEqualityTest { @AfterEach public void tearDown(SessionFactoryScope scope){ - scope.inTransaction( - session -> { - session.createQuery( "delete from A" ).executeUpdate(); - session.createQuery( "delete from B" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/CteCycleTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/CteCycleTests.java index 952a7794568e..0f95225c1009 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/CteCycleTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/CteCycleTests.java @@ -102,9 +102,6 @@ public void prepareTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createMutationQuery( "update Contact set alternativeContact = null" ).executeUpdate(); - session.createMutationQuery( "delete Contact" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/CteTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/CteTests.java index b3dc27f88cef..1518b2efa669 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/CteTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/CteTests.java @@ -675,9 +675,6 @@ private void verifySame(T criteriaResult, T hqlResult, Consumer verifier) @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createMutationQuery( "update Contact set alternativeContact = null" ).executeUpdate(); - session.createMutationQuery( "delete Contact" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/EntityAsParamValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/EntityAsParamValueTest.java index 083c277cd73a..5ef071a2aaec 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/EntityAsParamValueTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/EntityAsParamValueTest.java @@ -52,12 +52,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createMutationQuery( "delete from Event" ).executeUpdate(); - session.createMutationQuery( "delete from Organizer" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/FetchSizeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/FetchSizeTest.java index 252d5858a9d3..44a9dc924a3c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/FetchSizeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/FetchSizeTest.java @@ -73,9 +73,7 @@ public void clear(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> session.createMutationQuery( "delete from MyEntity" ).executeUpdate() - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/InExpressionCountLimitExceededTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/InExpressionCountLimitExceededTest.java index 0414faed2dfa..904f3ff902a7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/InExpressionCountLimitExceededTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/InExpressionCountLimitExceededTest.java @@ -57,9 +57,7 @@ public int getInExpressionCountLimit() { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> session.createMutationQuery( "delete from MyEntity" ).executeUpdate() - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryAndDiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryAndDiscriminatorTest.java index 8ba9a8a59581..eca33da0620f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryAndDiscriminatorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryAndDiscriminatorTest.java @@ -49,11 +49,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createMutationQuery( "delete TestEntity" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryLimitOffsetTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryLimitOffsetTest.java index 82036d239dd8..c605d3ed04f6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryLimitOffsetTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryLimitOffsetTest.java @@ -47,11 +47,7 @@ public void setup(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createMutationQuery( "delete from Person" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQuerySchemaPlaceholderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQuerySchemaPlaceholderTest.java index b81519d5ff43..1d21218a4260 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQuerySchemaPlaceholderTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQuerySchemaPlaceholderTest.java @@ -46,11 +46,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createMutationQuery( "delete from TestEntity" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryScrollableResultsTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryScrollableResultsTests.java index 936a4e5a6dc7..7dcbdbf943ca 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryScrollableResultsTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryScrollableResultsTests.java @@ -61,7 +61,7 @@ public void prepareTestData(SessionFactoryScope scope) throws Exception { @AfterEach protected void dropTestData(SessionFactoryScope scope) throws Exception { - scope.inTransaction( (session) -> session.createMutationQuery( "delete from MyEntity" ).executeUpdate() ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity(name = "MyEntity") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryWithDuplicateColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryWithDuplicateColumnTest.java index ffb7d3de7d51..75e4c2289113 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryWithDuplicateColumnTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryWithDuplicateColumnTest.java @@ -56,12 +56,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createMutationQuery( "delete from Book" ).executeUpdate(); - session.createMutationQuery( "delete from Publisher" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryApiTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryApiTests.java index 8edff0fc238f..8b383a6d7d9f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryApiTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryApiTests.java @@ -87,8 +87,6 @@ public void prepareTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createQuery( "delete Contact" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryHintTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryHintTest.java index 6911e97456f5..b69591c43141 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryHintTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryHintTest.java @@ -79,9 +79,7 @@ public void prepareTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createQuery( "from Contact" ).list().forEach( session::remove ); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/ReloadWithPreviousRowEntityTest2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/ReloadWithPreviousRowEntityTest2.java index 6798bfd158c0..647b81d5007e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/ReloadWithPreviousRowEntityTest2.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/ReloadWithPreviousRowEntityTest2.java @@ -61,13 +61,7 @@ public void prepareTestData(EntityManagerFactoryScope scope) { @AfterEach public void dropTestData(EntityManagerFactoryScope scope) { - scope.inTransaction( - (session) -> { - session.createQuery( "delete from Student" ).executeUpdate(); - session.createQuery( "delete from Teacher" ).executeUpdate(); - session.createQuery( "delete from TeacherDetails" ).executeUpdate(); - } - ); + scope.getEntityManagerFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/ReloadWithPreviousRowEntityTest3.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/ReloadWithPreviousRowEntityTest3.java index d8900186c3b6..dc99e17e9b18 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/ReloadWithPreviousRowEntityTest3.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/ReloadWithPreviousRowEntityTest3.java @@ -62,13 +62,7 @@ public void prepareTestData(EntityManagerFactoryScope scope) { @AfterEach public void dropTestData(EntityManagerFactoryScope scope) { - scope.inTransaction( - (session) -> { - session.createQuery( "delete from Student" ).executeUpdate(); - session.createQuery( "delete from Teacher" ).executeUpdate(); - session.createQuery( "delete from Skill" ).executeUpdate(); - } - ); + scope.getEntityManagerFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectCaseWhenNullLiteralTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectCaseWhenNullLiteralTest.java index 4aba139cccf1..83907a0dd300 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectCaseWhenNullLiteralTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectCaseWhenNullLiteralTest.java @@ -40,11 +40,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete from Person" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectJoinedAssociationMultipleTimesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectJoinedAssociationMultipleTimesTest.java index 9d5c2207aa33..d1ab124395ca 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectJoinedAssociationMultipleTimesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectJoinedAssociationMultipleTimesTest.java @@ -38,7 +38,7 @@ public void prepareTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> session.createMutationQuery( "delete Book" ).executeUpdate() ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity( name = "Book") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectManyToOneEmbeddedIdWithKeyManyToOneQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectManyToOneEmbeddedIdWithKeyManyToOneQueryTest.java index 2124e670040d..12e7223bc108 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectManyToOneEmbeddedIdWithKeyManyToOneQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectManyToOneEmbeddedIdWithKeyManyToOneQueryTest.java @@ -67,13 +67,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "update EmbeddableTestEntity e set e.manyToOne = null" ).executeUpdate(); - session.createQuery( "delete from EmbeddableTestEntity" ).executeUpdate(); - session.createQuery( "delete from IntIdEntity" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectNullQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectNullQueryTest.java index 5b60a90c0f2e..9a7907bf1679 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectNullQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SelectNullQueryTest.java @@ -41,11 +41,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete from Person" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromEmbeddedIdTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromEmbeddedIdTests.java index dbabe0a43f62..16353f82b547 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromEmbeddedIdTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromEmbeddedIdTests.java @@ -218,10 +218,7 @@ public void prepareTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createQuery( "update Contact set alternativeContact = null" ).executeUpdate(); - session.createQuery( "delete Contact" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } private void verifySame(T criteriaResult, T hqlResult, Consumer verifier) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromIdClassTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromIdClassTests.java index 6b9e60b4ea4b..e2401f348e87 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromIdClassTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromIdClassTests.java @@ -217,10 +217,7 @@ public void prepareTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createQuery( "update Contact set alternativeContact = null" ).executeUpdate(); - session.createQuery( "delete Contact" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } private void verifySame(T criteriaResult, T hqlResult, Consumer verifier) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromInverseOneEmbeddedIdTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromInverseOneEmbeddedIdTests.java index 484e20223ee5..ebb7efe2fe47 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromInverseOneEmbeddedIdTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromInverseOneEmbeddedIdTests.java @@ -221,10 +221,7 @@ private void verifySame(T criteriaResult, T hqlResult, Consumer verifier) @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createQuery( "update Contact set primaryContact = null" ).executeUpdate(); - session.createQuery( "delete Contact" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromInverseOneIdClassTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromInverseOneIdClassTests.java index 29f3fd625e3b..94260e98a716 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromInverseOneIdClassTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromInverseOneIdClassTests.java @@ -222,10 +222,7 @@ private void verifySame(T criteriaResult, T hqlResult, Consumer verifier) @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createQuery( "update Contact set primaryContact = null" ).executeUpdate(); - session.createQuery( "delete Contact" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromInverseOneTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromInverseOneTests.java index bc0a746dc05c..3b0b06281b6d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromInverseOneTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromInverseOneTests.java @@ -219,10 +219,7 @@ private void verifySame(T criteriaResult, T hqlResult, Consumer verifier) @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createQuery( "update Contact set primaryContact = null" ).executeUpdate(); - session.createQuery( "delete Contact" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromManyToManyEmbeddedIdTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromManyToManyEmbeddedIdTests.java index dc15d384d636..9a35513d9877 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromManyToManyEmbeddedIdTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromManyToManyEmbeddedIdTests.java @@ -221,9 +221,7 @@ private void verifySame(T criteriaResult, T hqlResult, Consumer verifier) @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createQuery( "delete Contact" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromManyToManyIdClassTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromManyToManyIdClassTests.java index a3389e98e2c3..066bc32aec51 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromManyToManyIdClassTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromManyToManyIdClassTests.java @@ -222,9 +222,7 @@ private void verifySame(T criteriaResult, T hqlResult, Consumer verifier) @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createQuery( "delete Contact" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromManyToManyTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromManyToManyTests.java index 49591414db5f..07409a0ae126 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromManyToManyTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromManyToManyTests.java @@ -219,9 +219,7 @@ private void verifySame(T criteriaResult, T hqlResult, Consumer verifier) @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createQuery( "delete Contact" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromOneToManyEmbeddedIdTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromOneToManyEmbeddedIdTests.java index 74fb279f8b92..e530d7bba06e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromOneToManyEmbeddedIdTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromOneToManyEmbeddedIdTests.java @@ -223,10 +223,7 @@ private void verifySame(T criteriaResult, T hqlResult, Consumer verifier) @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createQuery( "update Contact set primaryContact = null" ).executeUpdate(); - session.createQuery( "delete Contact" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromOneToManyIdClassTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromOneToManyIdClassTests.java index e9d507f3aafb..fcb58b915bbd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromOneToManyIdClassTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromOneToManyIdClassTests.java @@ -224,10 +224,7 @@ private void verifySame(T criteriaResult, T hqlResult, Consumer verifier) @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createQuery( "update Contact set primaryContact = null" ).executeUpdate(); - session.createQuery( "delete Contact" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromOneToManyTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromOneToManyTests.java index 21f98f20d6b0..8b6251efcf1d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromOneToManyTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromOneToManyTests.java @@ -221,10 +221,7 @@ private void verifySame(T criteriaResult, T hqlResult, Consumer verifier) @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createQuery( "update Contact set primaryContact = null" ).executeUpdate(); - session.createQuery( "delete Contact" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromTests.java index 6755b4d67cab..fb6476f3eb9a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SubQueryInFromTests.java @@ -478,9 +478,6 @@ private void verifySame(T criteriaResult, T hqlResult, Consumer verifier) @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createQuery( "update Contact set alternativeContact = null" ).executeUpdate(); - session.createQuery( "delete Contact" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/TupleInListAlternativeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/TupleInListAlternativeTests.java index db5294634936..1b6c49e9f46f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/TupleInListAlternativeTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/TupleInListAlternativeTests.java @@ -56,8 +56,7 @@ public void setup(SessionFactoryScope scope) { @AfterEach public void cleanup(SessionFactoryScope scope) { - scope.inTransaction( - session -> session.createMutationQuery( "delete from EntityWithEmbeddedSubEntity" ).executeUpdate() ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaBuilderNonStandardFunctionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaBuilderNonStandardFunctionsTest.java index 8204efe92f93..f86997a0d555 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaBuilderNonStandardFunctionsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaBuilderNonStandardFunctionsTest.java @@ -115,7 +115,7 @@ public void prepareData(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( session -> session.createMutationQuery( "delete from EntityOfBasics" ).executeUpdate() ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaCrossJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaCrossJoinTest.java index 374491606dda..3d8973c06c08 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaCrossJoinTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaCrossJoinTest.java @@ -90,7 +90,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( session -> session.createMutationQuery( "delete from EntityOfBasics" ).executeUpdate() ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaOrderedSetAggregateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaOrderedSetAggregateTest.java index 7471f1583862..a90a3264d565 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaOrderedSetAggregateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaOrderedSetAggregateTest.java @@ -106,7 +106,7 @@ public void prepareData(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( session -> session.createMutationQuery( "delete from EntityOfBasics" ).executeUpdate() ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaWindowFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaWindowFunctionTest.java index dfec6867cd78..19512c8ad928 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaWindowFunctionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaWindowFunctionTest.java @@ -105,9 +105,7 @@ public void prepareData(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> session.createMutationQuery( "delete from EntityOfBasics" ).executeUpdate() - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/MultiSelectTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/MultiSelectTests.java index a7504731d88e..4df86e4037ad 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/MultiSelectTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/MultiSelectTests.java @@ -241,6 +241,6 @@ public void createTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> session.createQuery( "delete BasicEntity" ).executeUpdate() ); + scope.getSessionFactory().getSchemaManager().truncate(); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/NegationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/NegationTests.java index 48509244e2b7..9539a1a17cce 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/NegationTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/NegationTests.java @@ -48,6 +48,6 @@ public void createTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> session.createQuery( "delete BasicEntity" ).executeUpdate() ); + scope.getSessionFactory().getSchemaManager().truncate(); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/SubQueryTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/SubQueryTests.java index acd4dc28e3f7..6e638a496a06 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/SubQueryTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/SubQueryTests.java @@ -78,8 +78,6 @@ public void modifiedSubQueryHqlTest(SessionFactoryScope scope) { @AfterEach public void cleanUpTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createQuery( "delete BasicEntity" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AggregateFilterClauseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AggregateFilterClauseTest.java index ea2a2082efed..497f522cf943 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AggregateFilterClauseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AggregateFilterClauseTest.java @@ -85,9 +85,7 @@ public void prepareData(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> session.createQuery( "delete from EntityOfBasics" ).executeUpdate() - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AggregateFunctionsWithSubSelectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AggregateFunctionsWithSubSelectTest.java index 458ab770ce24..8b16e0a25de0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AggregateFunctionsWithSubSelectTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AggregateFunctionsWithSubSelectTest.java @@ -68,12 +68,7 @@ protected void prepareTest(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( - (session) -> { - session.createQuery( "delete Document" ).executeUpdate(); - session.createQuery( "delete Person" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CaseStatementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CaseStatementTest.java index 91cc4bd5aa55..f1734496d388 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CaseStatementTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CaseStatementTest.java @@ -163,8 +163,6 @@ public Person(Integer id, String name) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( - (session) -> session.createQuery( "delete Person" ).executeUpdate() - ); + scope.getSessionFactory().getSchemaManager().truncate(); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CastNullSelectExpressionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CastNullSelectExpressionTest.java index a23b565dd170..62eef70d46a8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CastNullSelectExpressionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CastNullSelectExpressionTest.java @@ -104,9 +104,7 @@ public void createTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( - (session) -> session.createQuery( "delete Person" ).executeUpdate() - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity( name= "Person" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DateQueryParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DateQueryParameterTest.java index 2674fe723246..19ee79dee2d3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DateQueryParameterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DateQueryParameterTest.java @@ -78,11 +78,7 @@ public void testDateEntityQuery(SessionFactoryScope scope) { @AfterEach public void cleanUpData(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete DateEntity" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity(name = "DateEntity") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DeleteJoinTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DeleteJoinTests.java index a828f17eb6f1..cec16ef0658d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DeleteJoinTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DeleteJoinTests.java @@ -51,10 +51,7 @@ public void prepareData(SessionFactoryScope scope) { @AfterEach public void cleanupData(SessionFactoryScope scope) { - scope.inTransaction( session -> { - session.createMutationQuery( "delete from Contact" ).executeUpdate(); - session.createMutationQuery( "delete from BasicEntity" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddableAsParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddableAsParameterTest.java index 7f78602902dc..fc50575f745a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddableAsParameterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddableAsParameterTest.java @@ -84,11 +84,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete Person" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity(name = "Person") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddedIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddedIdTest.java index b9852374d6f7..2b88b279e27c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddedIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddedIdTest.java @@ -46,13 +46,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete from PersonDocument" ).executeUpdate(); - session.createQuery( "delete from Person" ).executeUpdate(); - session.createQuery( "delete from Document" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EntityJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EntityJoinTest.java index 80a9ea75652a..28a1a2c33ef0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EntityJoinTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EntityJoinTest.java @@ -295,13 +295,7 @@ public void createTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( - (session) -> { - session.createQuery( "delete FinancialRecord" ).executeUpdate(); - session.createQuery( "delete User" ).executeUpdate(); - session.createQuery( "delete Customer" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity(name = "Customer") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/GroupByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/GroupByTest.java index b80e88e99037..192cd24a849b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/GroupByTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/GroupByTest.java @@ -119,9 +119,7 @@ public void prepareData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createQuery( "delete Contact" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/HHH17416Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/HHH17416Test.java index a1781a629908..af1a03899ac3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/HHH17416Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/HHH17416Test.java @@ -40,7 +40,7 @@ public void setup() { @AfterEach public void teardown() { - inTransaction(session -> session.createMutationQuery("delete from Person").executeUpdate()); + sessionFactoryScope().getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ILikeCriteriaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ILikeCriteriaTest.java index 493ad97da5b8..4818e5863033 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ILikeCriteriaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ILikeCriteriaTest.java @@ -63,9 +63,7 @@ public void prepareData(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> session.createQuery( "delete from BasicEntity" ).executeUpdate() - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ILikeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ILikeTest.java index ef523103c490..1dc205aaaa41 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ILikeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ILikeTest.java @@ -59,9 +59,7 @@ public void prepareData(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> session.createQuery( "delete from BasicEntity" ).executeUpdate() - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertConflictTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertConflictTests.java index bba7fd5af42a..7ff0a90bae8b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertConflictTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertConflictTests.java @@ -53,10 +53,7 @@ public void prepareData(SessionFactoryScope scope) { @AfterEach public void cleanupData(SessionFactoryScope scope) { - scope.inTransaction( session -> { - session.createMutationQuery( "delete from Contact" ).executeUpdate(); - session.createMutationQuery( "delete from BasicEntity" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertSelectTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertSelectTests.java index 77e833bbb841..2027a277ee4b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertSelectTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertSelectTests.java @@ -44,11 +44,7 @@ public void prepareTestData(SessionFactoryScope scope) { @AfterEach public void cleanupTestData(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createMutationQuery( "delete from java.lang.Object" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/IsEmptyPredicateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/IsEmptyPredicateTest.java index ea4f7a440e77..d090c0779f65 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/IsEmptyPredicateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/IsEmptyPredicateTest.java @@ -81,9 +81,7 @@ protected void prepareTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createQuery( "delete Person" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity(name = "Person") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/JsonFunctionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/JsonFunctionTests.java index 21676974c929..ed3bad3b08ac 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/JsonFunctionTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/JsonFunctionTests.java @@ -117,12 +117,7 @@ public void prepareData(SessionFactoryScope scope) { @AfterEach public void cleanupData(SessionFactoryScope scope) { - scope.inTransaction( - em -> { - em.createMutationQuery( "delete from EntityOfBasics" ).executeUpdate(); - em.createMutationQuery( "delete from JsonHolder" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LegacyParameterTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LegacyParameterTests.java index bf6f8b0d5a34..6d62b133032b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LegacyParameterTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LegacyParameterTests.java @@ -229,10 +229,6 @@ public void createTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( - (s) -> { - s.createQuery( "delete Human" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LikeEscapeDefaultTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LikeEscapeDefaultTest.java index f0bb2c58d37c..0e158e81ca74 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LikeEscapeDefaultTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LikeEscapeDefaultTest.java @@ -45,9 +45,7 @@ public void prepareData(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> session.createMutationQuery( "delete from BasicEntity" ).executeUpdate() - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/MultiValuedParameterInFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/MultiValuedParameterInFunctionTest.java index 48755e296940..72bcc36de465 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/MultiValuedParameterInFunctionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/MultiValuedParameterInFunctionTest.java @@ -48,7 +48,7 @@ public void testAsQueryParameter(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> session.createQuery( "delete Post" ).executeUpdate() ); + scope.getSessionFactory().getSchemaManager().truncate(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/NamedHqlQueriesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/NamedHqlQueriesTest.java index 2c01430e2f1c..0cf9a9923e8a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/NamedHqlQueriesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/NamedHqlQueriesTest.java @@ -66,11 +66,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> session.createQuery( "from VideoGame vg", VideoGame.class ) - .list() - .forEach(session::remove) - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity(name = "VideoGame") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/OrderedSetAggregateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/OrderedSetAggregateTest.java index 2b732d65fd87..9c700b9ec8cb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/OrderedSetAggregateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/OrderedSetAggregateTest.java @@ -95,9 +95,7 @@ public void prepareData(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> session.createQuery( "delete from EntityOfBasics" ).executeUpdate() - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SubqueryLimitOffsetTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SubqueryLimitOffsetTest.java index 4bab0cf85fbf..e45db73753e2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SubqueryLimitOffsetTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SubqueryLimitOffsetTest.java @@ -67,10 +67,6 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> session.createQuery( "from SimpleEntity e" ) - .list() - .forEach( simpleEntity -> session.remove( simpleEntity ) ) - ); + scope.getSessionFactory().getSchemaManager().truncate(); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SubqueryOperatorsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SubqueryOperatorsTest.java index 7963d38480ba..ee95031c458a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SubqueryOperatorsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SubqueryOperatorsTest.java @@ -127,10 +127,6 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete SimpleEntity" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ToOneFetchAndJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ToOneFetchAndJoinTest.java index 82a90c8dccde..1d8f5738129c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ToOneFetchAndJoinTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ToOneFetchAndJoinTest.java @@ -139,12 +139,6 @@ public void setupData(SessionFactoryScope scope) { @AfterEach public void cleanupData(SessionFactoryScope scope) { - scope.inTransaction( - (session) -> { - session.createQuery( "delete Entity1" ).executeUpdate(); - session.createQuery( "delete Entity2" ).executeUpdate(); - session.createQuery( "delete Entity3" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/TupleTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/TupleTest.java index 16a2accae659..ab8a59ee80ad 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/TupleTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/TupleTest.java @@ -64,8 +64,6 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> session.createMutationQuery( "delete SimpleEntity" ).executeUpdate() - ); + scope.getSessionFactory().getSchemaManager().truncate(); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/UnionAllSelectNullTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/UnionAllSelectNullTest.java index 41c416bb204a..778317bb10f5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/UnionAllSelectNullTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/UnionAllSelectNullTest.java @@ -43,12 +43,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete TestEntity" ).executeUpdate(); - session.createQuery( "delete AnotherTestEntity" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/UpdateJoinTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/UpdateJoinTests.java index 95c656471597..8ad7ce4f1148 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/UpdateJoinTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/UpdateJoinTests.java @@ -50,10 +50,7 @@ public void prepareData(SessionFactoryScope scope) { @AfterEach public void cleanupData(SessionFactoryScope scope) { - scope.inTransaction( session -> { - session.createMutationQuery( "delete from Contact" ).executeUpdate(); - session.createMutationQuery( "delete from BasicEntity" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/WindowFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/WindowFunctionTest.java index 04b9f6b2d1f9..27e96b2ea2c5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/WindowFunctionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/WindowFunctionTest.java @@ -97,9 +97,7 @@ public void prepareData(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> session.createQuery( "delete from EntityOfBasics" ).executeUpdate() - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/XmlFunctionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/XmlFunctionTests.java index 450c41744979..238dcea705ff 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/XmlFunctionTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/XmlFunctionTests.java @@ -104,12 +104,7 @@ public void prepareData(SessionFactoryScope scope) { @AfterEach public void cleanupData(SessionFactoryScope scope) { - scope.inTransaction( - em -> { - em.createMutationQuery( "delete from EntityOfBasics" ).executeUpdate(); - em.createMutationQuery( "delete from XmlHolder" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/instantiation/InstantiationWithGenericsExpressionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/instantiation/InstantiationWithGenericsExpressionTest.java index 44c52a4975b5..d36de618b0f4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/instantiation/InstantiationWithGenericsExpressionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/instantiation/InstantiationWithGenericsExpressionTest.java @@ -48,7 +48,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( session -> session.createMutationQuery( "delete from ConcreteEntity" ).executeUpdate() ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/mutation/UpdateEntityWithEmbeddedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/mutation/UpdateEntityWithEmbeddedTest.java index 7f45af91a20e..1e47f9d43047 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/mutation/UpdateEntityWithEmbeddedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/mutation/UpdateEntityWithEmbeddedTest.java @@ -37,11 +37,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - (session) -> { - session.createQuery( "delete from Company" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/nullPrecedence/AbstractNullPrecedenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/nullPrecedence/AbstractNullPrecedenceTest.java index 21acdc3dd1a4..53d59dab3fff 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/nullPrecedence/AbstractNullPrecedenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/nullPrecedence/AbstractNullPrecedenceTest.java @@ -57,6 +57,6 @@ void testNullPrecedenceInOrdering(SessionFactoryScope scope) { @AfterEach void tearDown(SessionFactoryScope scope) { - scope.inTransaction( session -> session.createQuery( "delete from ExampleEntity" ).executeUpdate() ); + scope.getSessionFactory().getSchemaManager().truncate(); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/set/SetOperationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/set/SetOperationTest.java index cd2756fec6a0..2b19d2ae4496 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/set/SetOperationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/set/SetOperationTest.java @@ -58,15 +58,7 @@ public void createTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - // Because, why not MySQL/MariaDB... https://bugs.mysql.com/bug.php?id=7412 - session.createQuery( "update EntityWithManyToOneSelfReference set other = null" ).executeUpdate(); - session.createQuery( "delete from EntityWithManyToOneSelfReference" ).executeUpdate(); - session.createQuery( "delete from EntityOfLists" ).executeUpdate(); - session.createQuery( "delete from SimpleEntity" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/ManyToManySizeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/ManyToManySizeTest.java index 13fa9729baa7..faa8500092be 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/ManyToManySizeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/ManyToManySizeTest.java @@ -289,13 +289,7 @@ public void createTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( - (session) -> { - for ( Company company : session.createQuery( "from Company", Company.class ).list() ) { - session.remove( company ); - } - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity(name ="Company") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/ManyToManySizeTest2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/ManyToManySizeTest2.java index 7c05673ca7be..b8205c260b75 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/ManyToManySizeTest2.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/ManyToManySizeTest2.java @@ -470,13 +470,7 @@ public void prepareTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( - (session) -> { - session.createQuery( "delete from Student" ).executeUpdate(); - session.createQuery( "delete from Teacher" ).executeUpdate(); - session.createQuery( "delete from Skill" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/OneToManySizeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/OneToManySizeTest.java index f943a13ac8d7..d39ab1c204f8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/OneToManySizeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/OneToManySizeTest.java @@ -248,13 +248,7 @@ public void createTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( - (session) -> { - for ( Company company : session.createQuery( "from Company", Company.class ).list() ) { - session.remove( company ); - } - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity(name ="Company") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/OneToManySizeTest2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/OneToManySizeTest2.java index c5079da5e026..ee448da9a326 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/OneToManySizeTest2.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/OneToManySizeTest2.java @@ -594,13 +594,7 @@ public void prepareTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( - (session) -> { - session.createQuery( "delete from Student" ).executeUpdate(); - session.createQuery( "delete from Teacher" ).executeUpdate(); - session.createQuery( "delete from Skill" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } private static int countNumberOfJoins(String query) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/DiscriminatedTreatSmokeTesting.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/DiscriminatedTreatSmokeTesting.java index 6d72f0053de5..569806b0165e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/DiscriminatedTreatSmokeTesting.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/DiscriminatedTreatSmokeTesting.java @@ -101,9 +101,7 @@ public void prepareTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( - (session) -> session.createQuery( "delete Volume" ).executeUpdate() - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity( name = "Volume" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/DiscriminatedTreatSqmSmokeTesting.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/DiscriminatedTreatSqmSmokeTesting.java index fef964c3226e..e3c48519e6c6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/DiscriminatedTreatSqmSmokeTesting.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/DiscriminatedTreatSqmSmokeTesting.java @@ -100,9 +100,7 @@ public void prepareTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( - (session) -> session.createQuery( "delete Volume" ).executeUpdate() - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity( name = "Volume" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/JoinedTreatSmokeTesting.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/JoinedTreatSmokeTesting.java index a25d63e67274..84a1f06f0bd6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/JoinedTreatSmokeTesting.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/JoinedTreatSmokeTesting.java @@ -53,9 +53,7 @@ public void prepareTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( - (session) -> session.createQuery( "delete Volume" ).executeUpdate() - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test public void simpleImplicitTreatTest(SessionFactoryScope scope) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/PerClassTreatSmokeTesting.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/PerClassTreatSmokeTesting.java index 95546ca9da59..2be07461270a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/PerClassTreatSmokeTesting.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/treat/PerClassTreatSmokeTesting.java @@ -51,9 +51,7 @@ public void prepareTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( - (session) -> session.createQuery( "delete Volume" ).executeUpdate() - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test public void simpleImplicitTreatTest(SessionFactoryScope scope) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/JoinResultTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/JoinResultTests.java index 6d9880dcad80..2b0110c705f6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/JoinResultTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/JoinResultTests.java @@ -126,10 +126,7 @@ void createTestData(SessionFactoryScope scope) { @AfterEach void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createMutationQuery( "delete Product" ).executeUpdate(); - session.createMutationQuery( "delete Vendor" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } private static int extractNumberOfSelections(String sql) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultcache/QueryResultCacheTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultcache/QueryResultCacheTests.java index 5945d2b1d4d2..fbb4a0113905 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultcache/QueryResultCacheTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultcache/QueryResultCacheTests.java @@ -202,11 +202,6 @@ public void prepareTestData(SessionFactoryScope scope) { @AfterEach public void cleanupTestData(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete AggregateEntity" ).executeUpdate(); - session.createQuery( "delete TestEntity" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/AbstractUsageTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/AbstractUsageTest.java index c00bda14439c..1d90e77f2007 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/AbstractUsageTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/AbstractUsageTest.java @@ -27,10 +27,6 @@ public void prepareData(SessionFactoryScope scope) { @AfterEach public void cleanUpData(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete SimpleEntityWithNamedMappings" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/EntityResultTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/EntityResultTests.java index 0a4550b2e74f..f3109088c03c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/EntityResultTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/EntityResultTests.java @@ -426,15 +426,6 @@ public void createTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - // discriminator hierarchy data - session.createQuery( "delete DiscriminatedRoot" ).executeUpdate(); - // converted values data - session.createQuery( "delete EntityOfBasics" ).executeUpdate(); - // embedded values - session.createQuery( "delete EntityWithEmbedded" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/InheritanceTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/InheritanceTests.java index 1fa48a210a77..787ac591faa5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/InheritanceTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/InheritanceTests.java @@ -47,11 +47,7 @@ public void prepareData(SessionFactoryScope scope) { @AfterEach public void cleanUpData(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete Child" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/NamedNativeQueryWithCountColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/NamedNativeQueryWithCountColumnTest.java index a7fc5a50250c..b6def298f274 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/NamedNativeQueryWithCountColumnTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/NamedNativeQueryWithCountColumnTest.java @@ -50,10 +50,7 @@ public void setUp(EntityManagerFactoryScope scope) { @AfterEach public void tearDown(EntityManagerFactoryScope scope) { - scope.inTransaction( - entityManager -> - entityManager.createQuery( "delete from Sample" ).executeUpdate() - ); + scope.getEntityManagerFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/BasicCriteriaResultTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/BasicCriteriaResultTests.java index 3aa838e295d4..57f9c22d1f55 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/BasicCriteriaResultTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/BasicCriteriaResultTests.java @@ -40,9 +40,7 @@ public void prepareTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createQuery( "delete SimpleEntity" ).executeUpdate(); - }); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/BasicHqlResultTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/BasicHqlResultTests.java index 0088be3e5835..3f73a665155f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/BasicHqlResultTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/BasicHqlResultTests.java @@ -31,9 +31,7 @@ public void prepareTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createQuery( "delete SimpleEntity" ).executeUpdate(); - }); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/ImplicitInstantiationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/ImplicitInstantiationTests.java index f69e05ee97e7..c693199b9135 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/ImplicitInstantiationTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/ImplicitInstantiationTests.java @@ -33,10 +33,8 @@ void prepareTestData(SessionFactoryScope sessions) { } @AfterEach - public void dropTestData(SessionFactoryScope sessions) { - sessions.inTransaction( (session) -> { - session.createMutationQuery( "delete SimpleEntity" ).executeUpdate(); - }); + public void dropTestData(SessionFactoryScope scope) { + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/ImplicitSelectWithJoinTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/ImplicitSelectWithJoinTests.java index 74c45c937d7a..90dbea7516b9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/ImplicitSelectWithJoinTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/ImplicitSelectWithJoinTests.java @@ -277,9 +277,6 @@ public void prepareTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createMutationQuery( "delete Product" ).executeUpdate(); - session.createMutationQuery( "delete Vendor" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/TypedQueryCreationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/TypedQueryCreationTests.java index 5ced6730599b..198c71cfaf19 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/TypedQueryCreationTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/TypedQueryCreationTests.java @@ -34,10 +34,8 @@ void prepareTestData(SessionFactoryScope sessions) { } @AfterEach - public void dropTestData(SessionFactoryScope sessions) { - sessions.inTransaction( (session) -> { - session.createMutationQuery( "delete SimpleEntity" ).executeUpdate(); - }); + public void dropTestData(SessionFactoryScope scope) { + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/returns/ResultListTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/returns/ResultListTest.java index 00eb49b8b4a7..0d9b59b63f8d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/returns/ResultListTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/returns/ResultListTest.java @@ -44,9 +44,7 @@ public void setUpTestData(SessionFactoryScope scope) { @AfterEach public void cleanUpTestData(SessionFactoryScope scope) { - scope.inTransaction( - (session) -> session.createQuery( "delete BasicEntity" ).executeUpdate() - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/returns/ScrollableResultsTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/returns/ScrollableResultsTests.java index 9ea47d18c1ff..2f728d1c27e1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/returns/ScrollableResultsTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/returns/ScrollableResultsTests.java @@ -48,9 +48,7 @@ public void setUpTestData(SessionFactoryScope scope) { @AfterEach public void cleanUpTestData(SessionFactoryScope scope) { - scope.inTransaction( - (session) -> session.createQuery( "delete BasicEntity" ).executeUpdate() - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/EmbeddableAndNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/EmbeddableAndNativeQueryTest.java index d6ade5e2369b..eb3334c5a80c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/EmbeddableAndNativeQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/EmbeddableAndNativeQueryTest.java @@ -45,10 +45,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> - session.createMutationQuery( "delete from Person" ).executeUpdate() - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/EmbeddableLazyFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/EmbeddableLazyFetchTest.java index 2c60cf295212..c6bf1cdf8957 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/EmbeddableLazyFetchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/EmbeddableLazyFetchTest.java @@ -43,10 +43,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> - session.createMutationQuery( "delete from Person" ).executeUpdate() - ); + scope.getSessionFactory().getSchemaManager().truncate();; } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryResultBuilderTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryResultBuilderTests.java index 3d095957dd6a..bb7a92c31821 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryResultBuilderTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryResultBuilderTests.java @@ -371,12 +371,7 @@ public void prepareData(SessionFactoryScope scope) throws MalformedURLException @AfterEach public void cleanUpData(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete EntityOfBasics" ).executeUpdate(); - session.createQuery( "delete BasicEntity" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } public static class DTO { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/BasicSelectionQueryTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/BasicSelectionQueryTests.java index 5da74aa859a5..70c1f4921f97 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/BasicSelectionQueryTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/BasicSelectionQueryTests.java @@ -111,9 +111,7 @@ public void tupleSelectionTest(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createMutationQuery( "delete DummyEntity" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/DiscriminatorTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/DiscriminatorTests.java index 726b0fbbf3f3..3c9a7851ad3c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/DiscriminatorTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/DiscriminatorTests.java @@ -42,11 +42,7 @@ public void setUpTestData() { @AfterEach public void cleanUpTestData() { - inTransaction( - session -> { - session.createQuery( "delete Vendor" ).executeUpdate(); - } - ); + sessionFactoryScope().getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryCacheTest.java index a612e7e521ed..a4dc2ab2364b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryCacheTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryCacheTest.java @@ -81,10 +81,7 @@ public class QueryCacheTest { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> - session.createQuery( "from java.lang.Object" ).list().forEach( session::remove ) - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @AfterAll diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryRestrictedCollectionCachingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryRestrictedCollectionCachingTests.java index 238eb40bfed9..e5dfa11345bd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryRestrictedCollectionCachingTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryRestrictedCollectionCachingTests.java @@ -160,12 +160,8 @@ void createTestData(SessionFactoryScope sessions) { } @AfterEach - void dropTestData(SessionFactoryScope sessions) { - sessions.inTransaction( (session) -> { -// session.createNativeMutationQuery( "delete book_authors" ).executeUpdate(); -// session.createNativeMutationQuery( "delete book_editors" ).executeUpdate(); - session.createMutationQuery( "delete Book" ).executeUpdate(); - session.createMutationQuery( "delete Person" ).executeUpdate(); - } ); + void dropTestData(SessionFactoryScope scope) { + scope.getSessionFactory().getSchemaManager().truncate(); + scope.getSessionFactory().getCache().evictAllRegions(); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/StructuredQueryCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/StructuredQueryCacheTest.java index 6be9932fd92c..5494137a3a2a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/StructuredQueryCacheTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/StructuredQueryCacheTest.java @@ -55,12 +55,7 @@ public class StructuredQueryCacheTest { @AfterEach public void tearDown(SessionFactoryScope scope){ - scope.inTransaction( - session -> { - session.createQuery( "delete from OneToManyWithEmbeddedIdChild" ).executeUpdate(); - session.createQuery( "delete from OneToManyWithEmbeddedId" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/queryhint/QueryHintHANATest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/queryhint/QueryHintHANATest.java index 575f2b3c854b..ae30dd44b22d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/queryhint/QueryHintHANATest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/queryhint/QueryHintHANATest.java @@ -65,10 +65,7 @@ public void prepareTestData(SessionFactoryScope scope) { @AfterEach public void cleanupTestData(SessionFactoryScope scope) { - scope.inTransaction( (s) -> { - s.createMutationQuery( "delete from QueryHintHANATest$Employee" ).executeUpdate(); - s.createMutationQuery( "delete from QueryHintHANATest$Department" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyNamedQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyNamedQueryTest.java index 3d63e2c6ff8e..76fdc282a2de 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyNamedQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyNamedQueryTest.java @@ -29,7 +29,7 @@ public class ReadOnlyNamedQueryTest extends AbstractReadOnlyTest { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( session -> session.createMutationQuery( "delete from TestEntity" ).executeUpdate() ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlySessionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlySessionTest.java index e3e199300f7f..004050843018 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlySessionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlySessionTest.java @@ -40,12 +40,7 @@ public class ReadOnlySessionTest extends AbstractReadOnlyTest { @AfterEach public void tearDown(SessionFactoryScope scope){ - scope.inTransaction( - session -> { - session.createQuery( "delete from DataPoint" ).executeUpdate(); - session.createQuery( "delete from TextHolder" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyVersionedNodesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyVersionedNodesTest.java index 66c13880928a..21a9a7014fc6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyVersionedNodesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyVersionedNodesTest.java @@ -25,12 +25,7 @@ public class ReadOnlyVersionedNodesTest extends AbstractReadOnlyTest { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "select v from VersionedNode v" ).list() - .forEach( node -> session.remove( node ) ); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/reattachment/CollectionReattachmentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/reattachment/CollectionReattachmentTest.java index 980a9fa2bb56..6d55126a31cc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/reattachment/CollectionReattachmentTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/reattachment/CollectionReattachmentTest.java @@ -24,12 +24,7 @@ public class CollectionReattachmentTest { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete from Child" ).executeUpdate(); - session.createQuery( "delete from Parent" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/reattachment/ProxyReattachmentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/reattachment/ProxyReattachmentTest.java index 25b3816afc4f..9a82b8083ba9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/reattachment/ProxyReattachmentTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/reattachment/ProxyReattachmentTest.java @@ -24,12 +24,7 @@ public class ProxyReattachmentTest { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete from Parent" ).executeUpdate(); - session.createQuery( "delete from Child" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/secondarytable/SecondaryRowTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/secondarytable/SecondaryRowTest.java index 1aef8544ed10..5284b9f75a76 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/secondarytable/SecondaryRowTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/secondarytable/SecondaryRowTest.java @@ -75,9 +75,7 @@ public void testOwnedSecondaryTable(SessionFactoryScope scope) { @AfterEach void cleanUpTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createSelectionQuery( "from Record" ).stream().forEach( session::remove ); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } private static void verifySecondaryRows(String table, int expectedCount, SessionFactoryScope sfScope) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/set/SetOperationJpaCriteriaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/set/SetOperationJpaCriteriaTest.java index f8a8a5a8ff7b..2f5aa3b61573 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/set/SetOperationJpaCriteriaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/set/SetOperationJpaCriteriaTest.java @@ -47,12 +47,7 @@ public void createTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete from EntityOfLists" ).executeUpdate(); - session.createQuery( "delete from SimpleEntity" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/SortTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/SortTest.java index 1718d118c267..4feb97930c33 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/SortTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/SortTest.java @@ -89,9 +89,7 @@ void setUp(SessionFactoryScope scope) { @AfterEach void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> session.createQuery( "delete from Search" ).executeUpdate() - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/StatementCommentTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/StatementCommentTests.java index a6a58fc924f6..2853709de486 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/StatementCommentTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/StatementCommentTests.java @@ -76,9 +76,7 @@ private void checkEntityComments(SQLStatementInspector inspector) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createMutationQuery( "delete VersionedEntity" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity( name = "VersionedEntity" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/ast/ParameterMarkerStrategyTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/ast/ParameterMarkerStrategyTests.java index 0a12008c7c1c..3258f8b8ee1b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/ast/ParameterMarkerStrategyTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/ast/ParameterMarkerStrategyTests.java @@ -155,11 +155,7 @@ public void testNativeQuery(SessionFactoryScope scope) { @AfterEach public void cleanUpTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createMutationQuery( "delete EntityOfBasics" ).executeUpdate(); - session.createMutationQuery( "delete EntityWithFilters" ).executeUpdate(); - session.createMutationQuery( "delete EntityWithVersion" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } public static class ParameterMarkerStrategyImpl implements ParameterMarkerStrategy { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EmbeddedIdEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EmbeddedIdEntityTest.java index 50a756ebf097..a6db854dfa35 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EmbeddedIdEntityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EmbeddedIdEntityTest.java @@ -51,10 +51,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> - session.createQuery( "delete from EmbeddedIdEntity" ).executeUpdate() - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EmbeddedWithManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EmbeddedWithManyToOneTest.java index a63c60542fce..ff841fc8f559 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EmbeddedWithManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EmbeddedWithManyToOneTest.java @@ -54,12 +54,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete from SystemUser" ).executeUpdate(); - session.createQuery( "delete from Subsystem" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EntityWithEmbeddedIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EntityWithEmbeddedIdTest.java index 9bfbda77af46..d972b4278870 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EntityWithEmbeddedIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EntityWithEmbeddedIdTest.java @@ -47,10 +47,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - sesison -> - sesison.createQuery( "delete from TestEntity" ).executeUpdate() - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EntityWithNotAggregateIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EntityWithNotAggregateIdTest.java index 66fac1c9e2e2..8186de938756 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EntityWithNotAggregateIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EntityWithNotAggregateIdTest.java @@ -47,10 +47,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - sesison -> - sesison.createQuery( "delete from EntityWithNotAggregateId" ).executeUpdate() - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/SmokeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/SmokeTests.java index 41d4972b431b..70db0fb237df 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/SmokeTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/SmokeTests.java @@ -4,7 +4,6 @@ */ package org.hibernate.orm.test.sql.exec; -import java.sql.Statement; import java.util.ArrayList; import java.util.List; import java.util.concurrent.Callable; @@ -81,17 +80,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> - session.doWork( - work -> { - Statement statement = work.createStatement(); - statement.execute( "delete from mapping_simple_entity" ); - statement.execute( "delete from mapping_other_entity" ); - statement.close(); - } - ) - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithEagerManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithEagerManyToOneTest.java index 3dcf5dccebcf..759695780f70 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithEagerManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithEagerManyToOneTest.java @@ -58,15 +58,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "update LazyAbstractEntityReference e set e.entity = null" ).executeUpdate(); - session.createQuery( "update LazyConcreteEntityReference e set e.entity = null" ).executeUpdate(); - session.createQuery( "delete from ConcreteEntity" ).executeUpdate(); - session.createQuery( "delete from LazyAbstractEntityReference" ).executeUpdate(); - session.createQuery( "delete from LazyConcreteEntityReference" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithLazyManyToOneSelfReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithLazyManyToOneSelfReferenceTest.java index 6148fccc3f7f..1fc06d1af837 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithLazyManyToOneSelfReferenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithLazyManyToOneSelfReferenceTest.java @@ -61,12 +61,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "update EntityWithLazyManyToOneSelfReference e set e.other = null" ).executeUpdate(); - session.createQuery( "delete from EntityWithLazyManyToOneSelfReference" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithLazyManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithLazyManyToOneTest.java index 62e1ee2c66f7..34c1afabc9d2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithLazyManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithLazyManyToOneTest.java @@ -60,15 +60,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "update LazyAbstractEntityReference e set e.entity = null" ).executeUpdate(); - session.createQuery( "update LazyConcreteEntityReference e set e.entity = null" ).executeUpdate(); - session.createQuery( "delete from ConcreteEntity" ).executeUpdate(); - session.createQuery( "delete from LazyAbstractEntityReference" ).executeUpdate(); - session.createQuery( "delete from LazyConcreteEntityReference" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithManyToOneJoinTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithManyToOneJoinTableTest.java index 54059388ea16..5949986f1726 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithManyToOneJoinTableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithManyToOneJoinTableTest.java @@ -68,13 +68,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete from EntityWithManyToOneJoinTable" ).executeUpdate(); - session.createQuery( "delete from SimpleEntity" ).executeUpdate(); - session.createQuery( "delete from BasicEntity" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithManyToOneSelfReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithManyToOneSelfReferenceTest.java index ed333916b181..401baf8965e4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithManyToOneSelfReferenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithManyToOneSelfReferenceTest.java @@ -61,12 +61,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "update EntityWithManyToOneSelfReference e set e.other = null" ).executeUpdate(); - session.createQuery( "delete from EntityWithManyToOneSelfReference" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/ManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/ManyToOneTest.java index 9f4f22ba8b81..040ae9cc0d43 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/ManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/ManyToOneTest.java @@ -319,13 +319,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete from OtherEntity" ).executeUpdate(); - session.createQuery( "delete from SimpleEntity" ).executeUpdate(); - session.createQuery( "delete from AnotherSimpleEntity" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity(name = "OtherEntity") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/EntityWithLazyBidirectionalOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/EntityWithLazyBidirectionalOneToOneTest.java index 5d3daa7371f9..6d21a714894f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/EntityWithLazyBidirectionalOneToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/EntityWithLazyBidirectionalOneToOneTest.java @@ -83,12 +83,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete from EntityWithLazyOneToOne" ).executeUpdate(); - session.createQuery( "delete from SimpleEntity" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/EntityWithOneToOneJoinTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/EntityWithOneToOneJoinTableTest.java index c5821b8fdf3a..d93e5f9700b8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/EntityWithOneToOneJoinTableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/EntityWithOneToOneJoinTableTest.java @@ -86,12 +86,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete from EntityWithOneToOneJoinTable" ).executeUpdate(); - session.createQuery( "delete from SimpleEntity" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/EntityWithOneToOneSharingPrimaryKeyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/EntityWithOneToOneSharingPrimaryKeyTest.java index 120c18674c23..58dd588b74ef 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/EntityWithOneToOneSharingPrimaryKeyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/EntityWithOneToOneSharingPrimaryKeyTest.java @@ -67,12 +67,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete from EntityWithOneToOneSharingPrimaryKey" ).executeUpdate(); - session.createQuery( "delete from SimpleEntity" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithBidirectionalAssociationsOneOfWhichIsAJoinTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithBidirectionalAssociationsOneOfWhichIsAJoinTableTest.java index 793f28ddf02b..b4150e917325 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithBidirectionalAssociationsOneOfWhichIsAJoinTableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithBidirectionalAssociationsOneOfWhichIsAJoinTableTest.java @@ -66,12 +66,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete from Parent" ).executeUpdate(); - session.createQuery( "delete from Male" ).executeUpdate(); - session.createQuery( "delete from Female" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithBidirectionalOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithBidirectionalOneToOneTest.java index 80ee3f9043f1..d4a31c15917d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithBidirectionalOneToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithBidirectionalOneToOneTest.java @@ -65,11 +65,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( session -> { - session.createQuery( "delete from AdoptedChild" ).executeUpdate(); - session.createQuery( "delete from Mother" ).executeUpdate(); - session.createQuery( "delete from Child" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithOneBidirectionalJoinTableAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithOneBidirectionalJoinTableAssociationTest.java index 6ddedc13a35b..86631b75a8a9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithOneBidirectionalJoinTableAssociationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithOneBidirectionalJoinTableAssociationTest.java @@ -54,11 +54,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete from Parent" ).executeUpdate(); - session.createQuery( "delete from Child" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithTwoBidirectionalAssociationsOneWithJoinTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithTwoBidirectionalAssociationsOneWithJoinTableTest.java index 8f2409f41ddd..ace32e799133 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithTwoBidirectionalAssociationsOneWithJoinTableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithTwoBidirectionalAssociationsOneWithJoinTableTest.java @@ -58,12 +58,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete from Parent" ).executeUpdate(); - session.createQuery( "delete from Child" ).executeUpdate(); - session.createQuery( "delete from Child2" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/query/EntityReturnClassTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/query/EntityReturnClassTests.java index b77e9786e82f..4b511e876c6f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/query/EntityReturnClassTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/query/EntityReturnClassTests.java @@ -121,6 +121,6 @@ void prepareTestData(SessionFactoryScope scope) { @AfterEach void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> session.createMutationQuery( "delete Speech" ).executeUpdate() ); + scope.getSessionFactory().getSchemaManager().truncate(); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/partition/PartitionKeyTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/partition/PartitionKeyTests.java index f719d4512c88..e37c9ae5f0be 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/partition/PartitionKeyTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/partition/PartitionKeyTests.java @@ -60,9 +60,7 @@ public void prepareTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createMutationQuery( "delete PartitionedEntity" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity( name = "PartitionedEntity" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/results/ResultsShapeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/results/ResultsShapeTests.java index 6e4c56af67ef..8c946585d44d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/results/ResultsShapeTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/results/ResultsShapeTests.java @@ -265,13 +265,6 @@ public void prepareTestData(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createMutationQuery( "delete LineItem" ).executeUpdate(); - session.createMutationQuery( "delete Order" ).executeUpdate(); - session.createMutationQuery( "delete Payment" ).executeUpdate(); - session.createMutationQuery( "delete Product" ).executeUpdate(); - session.createMutationQuery( "delete Vendor" ).executeUpdate(); - session.createMutationQuery( "delete SalesAssociate" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/syncSpace/NativeQuerySyncSpaceCachingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/syncSpace/NativeQuerySyncSpaceCachingTest.java index 90da5114a0c9..0fccc39b9db5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/syncSpace/NativeQuerySyncSpaceCachingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/syncSpace/NativeQuerySyncSpaceCachingTest.java @@ -55,10 +55,8 @@ public void before(SessionFactoryScope scope) { @AfterEach public void after(SessionFactoryScope scope) { - scope.inTransaction( - session -> - session.createQuery( "delete Customer" ).executeUpdate() - ); + scope.getSessionFactory().getSchemaManager().truncate(); + scope.getSessionFactory().getCache().evictAllRegions(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessDoWorkTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessDoWorkTest.java index 6c71abcb5101..7effe282008c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessDoWorkTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessDoWorkTest.java @@ -52,11 +52,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete from TestEntity" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionNativeQueryInsertTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionNativeQueryInsertTest.java index 28e8ce44c38a..fc8dad32f5a2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionNativeQueryInsertTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionNativeQueryInsertTest.java @@ -30,11 +30,7 @@ public class StatelessSessionNativeQueryInsertTest { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> - session.createQuery( "delete from TestEntity" ).executeUpdate() - - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionPersistentContextTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionPersistentContextTest.java index cc1f8e6128cd..821859df596d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionPersistentContextTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionPersistentContextTest.java @@ -41,12 +41,7 @@ public class StatelessSessionPersistentContextTest { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete from TestEntity" ).executeUpdate(); - session.createQuery( "delete from OtherEntity" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/StatelessSessionFetchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/StatelessSessionFetchingTest.java index 22d8cc3b9a6d..6e3fa577b55f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/StatelessSessionFetchingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/StatelessSessionFetchingTest.java @@ -209,16 +209,6 @@ public void testDynamicFetchCollectionScroll(SessionFactoryScope scope) { @AfterEach public void cleanup(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete Task" ).executeUpdate(); - session.createQuery( "delete Resource" ).executeUpdate(); - session.createQuery( "delete User" ).executeUpdate(); - - session.createQuery( "delete Product" ).executeUpdate(); - session.createQuery( "delete Producer" ).executeUpdate(); - session.createQuery( "delete Vendor" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/insert/StatelessSessionInsertTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/insert/StatelessSessionInsertTest.java index 749ffe64ca22..32b8da29e5e1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/insert/StatelessSessionInsertTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/insert/StatelessSessionInsertTest.java @@ -48,7 +48,6 @@ public void cleanup(SessionFactoryScope scope) { @Entity @Table(name = "departments") - @SuppressWarnings({"FieldCanBeLocal", "unused"}) public static class Department { @Id private Integer id; @@ -65,7 +64,6 @@ public Department(Integer id, String name) { @Entity @Table(name = "employees") - @SuppressWarnings({"FieldCanBeLocal", "unused"}) public static class Employee { @Id private Integer id; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stats/StatsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stats/StatsTest.java index e43634dd064a..843c782da60d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/stats/StatsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stats/StatsTest.java @@ -236,9 +236,7 @@ private Continent fillDb(Session s) { } private void cleanDb(Session s) { - s.createQuery( "delete Locality" ).executeUpdate(); - s.createQuery( "delete Country" ).executeUpdate(); - s.createQuery( "delete Continent" ).executeUpdate(); + s.getSessionFactory().getSchemaManager().truncate(); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stream/JpaNativeQueryFlushSessionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stream/JpaNativeQueryFlushSessionTest.java index a3920c420455..f96303d0ca39 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/stream/JpaNativeQueryFlushSessionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stream/JpaNativeQueryFlushSessionTest.java @@ -29,11 +29,7 @@ public class JpaNativeQueryFlushSessionTest { @AfterEach public void tearDown(EntityManagerFactoryScope scope) { - scope.inTransaction( - entityManager -> { - entityManager.createQuery( "delete from Person " ).executeUpdate(); - } - ); + scope.getEntityManagerFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stream/NativeQueryAndFlushSessionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stream/NativeQueryAndFlushSessionTest.java index 7cd5b80f9dd4..669b5afd78ff 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/stream/NativeQueryAndFlushSessionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stream/NativeQueryAndFlushSessionTest.java @@ -31,11 +31,7 @@ public class NativeQueryAndFlushSessionTest { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createQuery( "delete from Person " ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/subquery/MultipleIdenticalColumnsInSubqueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/subquery/MultipleIdenticalColumnsInSubqueryTest.java index 23b3366bf8d4..b07d27650f00 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/subquery/MultipleIdenticalColumnsInSubqueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/subquery/MultipleIdenticalColumnsInSubqueryTest.java @@ -31,7 +31,7 @@ void init(SessionFactoryScope scope) { @AfterEach void clean(SessionFactoryScope scope) { - scope.inTransaction( session -> session.createMutationQuery( "delete from Something" ).executeUpdate() ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tenantid/TenantIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tenantid/TenantIdTest.java index 283be297aded..250b91c00ff9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tenantid/TenantIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tenantid/TenantIdTest.java @@ -74,13 +74,7 @@ public void setup(SessionFactoryScope scope) { public void cleanup(SessionFactoryScope scope) { // Use the root tenant to clean up all partitions currentTenant = "root"; - scope.inTransaction( - session -> { - session.createMutationQuery( "delete from Account" ).executeUpdate(); - session.createMutationQuery( "delete from Client" ).executeUpdate(); - session.createMutationQuery( "delete from Record" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tenantidpk/TenantPkTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tenantidpk/TenantPkTest.java index 17e010fcc450..335a4abf27dc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tenantidpk/TenantPkTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tenantidpk/TenantPkTest.java @@ -41,10 +41,7 @@ public class TenantPkTest implements SessionFactoryProducer { @AfterEach public void cleanup(SessionFactoryScope scope) { - scope.inTransaction( session -> { - session.createQuery("delete from Account").executeUpdate(); - session.createQuery("delete from Client").executeUpdate(); - }); + scope.getSessionFactory().getSchemaManager().truncate(); } @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tenantlongid/TenantLongIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tenantlongid/TenantLongIdTest.java index acdd4e0ae79d..0129968a4f18 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tenantlongid/TenantLongIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tenantlongid/TenantLongIdTest.java @@ -38,10 +38,7 @@ public class TenantLongIdTest implements SessionFactoryProducer { @AfterEach public void cleanup(SessionFactoryScope scope) { - scope.inTransaction( session -> { - session.createQuery("delete from Account").executeUpdate(); - session.createQuery("delete from Client").executeUpdate(); - }); + scope.getSessionFactory().getSchemaManager().truncate(); } @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tenantuuid/TenantUuidTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tenantuuid/TenantUuidTest.java index 439fe16d0f40..9dec8211e12e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tenantuuid/TenantUuidTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tenantuuid/TenantUuidTest.java @@ -46,10 +46,7 @@ public class TenantUuidTest implements SessionFactoryProducer { @AfterEach public void cleanup(SessionFactoryScope scope) { - scope.inTransaction( session -> { - session.createQuery("delete from Account").executeUpdate(); - session.createQuery("delete from Client").executeUpdate(); - }); + scope.getSessionFactory().getSchemaManager().truncate(); } @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimestampDSTWithUTCTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimestampDSTWithUTCTest.java index a93f83c603f0..556e6e7baff3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimestampDSTWithUTCTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimestampDSTWithUTCTest.java @@ -54,10 +54,7 @@ public class JdbcTimestampDSTWithUTCTest { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> - session.createQuery( "delete from Person" ).executeUpdate() - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tm/CMTTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tm/CMTTest.java index 98b1e859f373..c097f17ab846 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tm/CMTTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tm/CMTTest.java @@ -85,10 +85,8 @@ public class CMTTest { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> - session.createQuery( "delete from Item" ).executeUpdate() - ); + scope.getSessionFactory().getSchemaManager().truncate(); + scope.getSessionFactory().getCache().evictAllRegions(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tm/JtaBeforeCompletionFailureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tm/JtaBeforeCompletionFailureTest.java index e65311bc5fbb..cd0eafae1d48 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tm/JtaBeforeCompletionFailureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tm/JtaBeforeCompletionFailureTest.java @@ -54,10 +54,7 @@ public void setUp() { @AfterEach public void tearDown() { - inTransaction( - session -> - session.createQuery( "delete SimpleEntity" ).executeUpdate() - ); + sessionFactoryScope().getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/BooleanArrayToStringTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/BooleanArrayToStringTest.java index 5adb28cd117f..72b45d4d545b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/BooleanArrayToStringTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/BooleanArrayToStringTest.java @@ -43,9 +43,7 @@ public void setup(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> session.createMutationQuery( "delete from TestEntity" ).executeUpdate() - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/OracleBigDecimalArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/OracleBigDecimalArrayTest.java index 8b5eab9c5bf0..4db5d0559eb5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/OracleBigDecimalArrayTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/OracleBigDecimalArrayTest.java @@ -42,9 +42,7 @@ public void prepareData(SessionFactoryScope scope) { @AfterEach public void cleanupData(SessionFactoryScope scope) { - scope.inTransaction( session -> { - session.createMutationQuery( "delete from EntityWithBigDecimalArray" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/UUIDTypeConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/UUIDTypeConverterTest.java index 7b0b92856e5f..d36fbf2b331f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/UUIDTypeConverterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/UUIDTypeConverterTest.java @@ -44,13 +44,7 @@ public class UUIDTypeConverterTest { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createMutationQuery( "delete from Image" ).executeUpdate(); - session.createMutationQuery( "delete from MarbleBox" ).executeUpdate(); - session.createMutationQuery( "delete from Marble" ).executeUpdate(); - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/ByteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/ByteTest.java index 55ab78a4fa8f..92be6e20c74e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/ByteTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/ByteTest.java @@ -39,10 +39,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> - session.createQuery( "delete from VariousTypesEntity" ).executeUpdate() - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/CharInNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/CharInNativeQueryTest.java index ae2f6010cdef..959f0ea96b9d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/CharInNativeQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/CharInNativeQueryTest.java @@ -40,10 +40,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> - session.createQuery( "delete from Issue" ).executeUpdate() - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/NullTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/NullTest.java index c2a342603667..9bb65fcdeaed 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/NullTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/NullTest.java @@ -36,10 +36,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> - session.createMutationQuery( "delete from SimpleEntity" ).executeUpdate() - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/typeoverride/TypeOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/typeoverride/TypeOverrideTest.java index 8bf44734c0df..2884dd21b93e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/typeoverride/TypeOverrideTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/typeoverride/TypeOverrideTest.java @@ -85,10 +85,7 @@ else if ( HANADialect.class.isInstance( dialect ) ) { @AfterEach public void tearDown() { - inTransaction( - session -> - session.createQuery( "delete from Entity" ).executeUpdate() - ); + sessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/typeparameters/TypeParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/typeparameters/TypeParameterTest.java index 021f7c967ca0..6d64a142b50d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/typeparameters/TypeParameterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/typeparameters/TypeParameterTest.java @@ -38,11 +38,7 @@ public class TypeParameterTest { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> - session.createQuery( "delete from Widget" ).executeUpdate() - - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unconstrained/UnconstrainedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unconstrained/UnconstrainedTest.java index 8a6090c31e57..8ab942411fce 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/unconstrained/UnconstrainedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unconstrained/UnconstrainedTest.java @@ -46,10 +46,7 @@ public void setUp(SessionFactoryScope scope) { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> - session.createQuery( "delete from Person" ).executeUpdate() - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/EntityWithNullVersionAndMapsIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/EntityWithNullVersionAndMapsIdTest.java index f2e408f41e58..687f5138a3f5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/EntityWithNullVersionAndMapsIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/EntityWithNullVersionAndMapsIdTest.java @@ -30,13 +30,7 @@ public class EntityWithNullVersionAndMapsIdTest { @AfterEach public void tearDown(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - session.createMutationQuery( "delete from Person" ); - session.createMutationQuery( "delete from Address" ); - - } - ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOne2Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOne2Test.java index 6e598078697a..785229b0b3eb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOne2Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOne2Test.java @@ -39,12 +39,7 @@ public class EagerManyToOne2Test { @AfterEach public void tearDown(EntityManagerFactoryScope scope) { - scope.inTransaction( - entityManager -> { - entityManager.createNativeQuery( "delete from children" ).executeUpdate(); - entityManager.createQuery( "delete from Parent" ).executeUpdate(); - } - ); + scope.getEntityManagerFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOne3Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOne3Test.java index 3b98951ef547..e2dcce347366 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOne3Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOne3Test.java @@ -38,12 +38,7 @@ public class EagerManyToOne3Test { @AfterEach public void tearDown(EntityManagerFactoryScope scope) { - scope.inTransaction( - entityManager -> { - entityManager.createNativeQuery( "delete from children" ).executeUpdate(); - entityManager.createQuery( "delete from Parent" ).executeUpdate(); - } - ); + scope.getEntityManagerFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOneTest.java index ca2dc9e4544c..35ed78202f8b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOneTest.java @@ -48,12 +48,7 @@ public void setUp(EntityManagerFactoryScope scope) { @AfterEach public void tearDown(EntityManagerFactoryScope scope) { - scope.inTransaction( - entityManager -> { - entityManager.createNativeQuery( "delete from children" ).executeUpdate(); - entityManager.createQuery( "delete from Parent" ).executeUpdate(); - } - ); + scope.getEntityManagerFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/MappedSuperclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/MappedSuperclassTest.java index 91c3286b85ae..fe0e8d231f84 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/MappedSuperclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/MappedSuperclassTest.java @@ -27,12 +27,7 @@ public class MappedSuperclassTest { @AfterEach public void tearDown(EntityManagerFactoryScope scope) { - scope.inTransaction( - entityManager -> { - entityManager.createQuery( "delete from SubClass" ).executeUpdate(); - entityManager.createQuery( "delete from Child" ).executeUpdate(); - } - ); + scope.getEntityManagerFactory().getSchemaManager().truncate(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/write/DynamicUpdateTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/write/DynamicUpdateTests.java index 1921478e181c..71a36aa70ce3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/write/DynamicUpdateTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/write/DynamicUpdateTests.java @@ -167,12 +167,7 @@ public void testAllLocking(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createMutationQuery( "delete AttachableJob" ).executeUpdate(); - session.createMutationQuery( "delete VersionedJob" ).executeUpdate(); - session.createMutationQuery( "delete DirtyJob" ).executeUpdate(); - session.createMutationQuery( "delete AllJob" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity( name = "DirtyJob" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/write/OptionalTableUpdateTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/write/OptionalTableUpdateTests.java index f2dcd1d18231..9c745976e197 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/write/OptionalTableUpdateTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/write/OptionalTableUpdateTests.java @@ -88,9 +88,7 @@ void testUpsertDelete(SessionFactoryScope scope) { @AfterEach void cleanUpTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createMutationQuery( "delete TheEntity" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity( name = "TheEntity" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/write/StaticDeleteTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/write/StaticDeleteTests.java index f0c1e1afaa1c..31f265cc4bd3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/write/StaticDeleteTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/write/StaticDeleteTests.java @@ -44,9 +44,7 @@ public void simpleTest(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createMutationQuery( "delete SimpleEntity" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Entity( name = "SimpleEntity" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/write/staticinsert/SimpleStaticInsertTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/write/staticinsert/SimpleStaticInsertTests.java index 3b6c274d5672..7f9b601ad5fe 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/write/staticinsert/SimpleStaticInsertTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/write/staticinsert/SimpleStaticInsertTests.java @@ -76,11 +76,7 @@ public void simpleJoinedTest(SessionFactoryScope scope) { @AfterEach public void dropTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> { - session.createMutationQuery( "delete Vendor" ).executeUpdate(); - session.createMutationQuery( "delete Payment" ).executeUpdate(); - session.createMutationQuery( "delete SalesAssociate" ).executeUpdate(); - } ); + scope.getSessionFactory().getSchemaManager().truncate(); } @Target({ ElementType.TYPE, ElementType.METHOD})