From c00a50f0c14834f16e77f597de5b898516fe8ef3 Mon Sep 17 00:00:00 2001 From: loic_lefevre Date: Fri, 19 Sep 2025 15:45:49 +0200 Subject: [PATCH] HHH-19791 - Avoid dropping/creating database objects when data is only read (SELECT) --- .../orm/test/query/hql/AggregateFilterClauseTest.java | 10 +++++----- .../hibernate/orm/test/query/hql/FunctionTests.java | 9 +++++---- .../orm/test/query/hql/ILikeCriteriaTest.java | 10 +++++----- .../org/hibernate/orm/test/query/hql/ILikeTest.java | 10 +++++----- .../orm/test/query/hql/JsonFunctionTests.java | 10 +++++----- .../orm/test/query/hql/StandardFunctionTests.java | 10 +++++----- 6 files changed, 30 insertions(+), 29 deletions(-) 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 497f522cf943..3f9209d8750e 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 @@ -15,9 +15,9 @@ import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; -import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -32,7 +32,7 @@ @SessionFactory public class AggregateFilterClauseTest { - @BeforeEach + @BeforeAll public void prepareData(SessionFactoryScope scope) { scope.inTransaction( em -> { @@ -83,9 +83,9 @@ public void prepareData(SessionFactoryScope scope) { ); } - @AfterEach + @AfterAll public void tearDown(SessionFactoryScope scope) { - scope.getSessionFactory().getSchemaManager().truncate(); + scope.dropData(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FunctionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FunctionTests.java index 892a2e5f6b58..43145f7d8bd8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FunctionTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FunctionTests.java @@ -45,8 +45,8 @@ import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; import org.hibernate.testing.orm.junit.SkipForDialect; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import java.math.BigDecimal; @@ -92,7 +92,8 @@ public class FunctionTests { public static final double ERROR = 0.00001d; - @BeforeEach @SuppressWarnings("deprecation") + @BeforeAll + @SuppressWarnings("deprecation") public void prepareData(SessionFactoryScope scope) { scope.inTransaction( em -> { @@ -129,7 +130,7 @@ public void prepareData(SessionFactoryScope scope) { ); } - @AfterEach + @AfterAll public void dropTestData(SessionFactoryScope scope) { scope.dropData(); } 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 4818e5863033..c7a7a7285ab7 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 @@ -19,8 +19,8 @@ import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; import org.hibernate.testing.orm.junit.Setting; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -35,7 +35,7 @@ @ServiceRegistry(settings = @Setting(name = AvailableSettings.CRITERIA_COPY_TREE, value = "true")) public class ILikeCriteriaTest { - @BeforeEach + @BeforeAll public void prepareData(SessionFactoryScope scope) { scope.inTransaction( em -> { @@ -61,9 +61,9 @@ public void prepareData(SessionFactoryScope scope) { ); } - @AfterEach + @AfterAll public void tearDown(SessionFactoryScope scope) { - scope.getSessionFactory().getSchemaManager().truncate(); + scope.dropData(); } @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 1dc205aaaa41..2f1542fcf44b 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 @@ -15,8 +15,8 @@ import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -31,7 +31,7 @@ @SessionFactory public class ILikeTest { - @BeforeEach + @BeforeAll public void prepareData(SessionFactoryScope scope) { scope.inTransaction( em -> { @@ -57,9 +57,9 @@ public void prepareData(SessionFactoryScope scope) { ); } - @AfterEach + @AfterAll public void tearDown(SessionFactoryScope scope) { - scope.getSessionFactory().getSchemaManager().truncate(); + scope.dropData(); } @Test 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 fcf80569cc3c..8a00d0b89062 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 @@ -39,8 +39,8 @@ import org.hibernate.testing.orm.junit.SessionFactoryScope; import org.hibernate.testing.orm.junit.Setting; import org.hibernate.testing.orm.junit.SkipForDialect; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import com.fasterxml.jackson.core.JsonProcessingException; @@ -77,7 +77,7 @@ public class JsonFunctionTests { JsonHolder entity; - @BeforeEach + @BeforeAll public void prepareData(SessionFactoryScope scope) { scope.inTransaction( em -> { @@ -117,9 +117,9 @@ public void prepareData(SessionFactoryScope scope) { ); } - @AfterEach + @AfterAll public void cleanupData(SessionFactoryScope scope) { - scope.getSessionFactory().getSchemaManager().truncate(); + scope.dropData(); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/StandardFunctionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/StandardFunctionTests.java index 9ab664f7f661..daa04e995cb6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/StandardFunctionTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/StandardFunctionTests.java @@ -26,8 +26,8 @@ import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; import org.hibernate.testing.orm.junit.SkipForDialect; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.anyOf; @@ -47,7 +47,7 @@ @SessionFactory public class StandardFunctionTests { - @BeforeEach + @BeforeAll public void prepareData(SessionFactoryScope scope) { scope.inTransaction( em -> { @@ -62,9 +62,9 @@ public void prepareData(SessionFactoryScope scope) { ); } - @AfterEach + @AfterAll public void truncateDate(SessionFactoryScope scope) { - scope.getSessionFactory().getSchemaManager().truncate(); + scope.dropData(); } @Test