From 9b47fcdfa825bc77003e4fb985b02bb2131d82e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Tue, 9 Nov 2021 18:02:28 +0100 Subject: [PATCH] HHH-14922 Test behavior when setting both implicit catalog/schema and default catalog/schema --- .../DefaultCatalogAndSchemaTest.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hibernate-core/src/test/java/org/hibernate/test/boot/database/qualfiedTableNaming/DefaultCatalogAndSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/test/boot/database/qualfiedTableNaming/DefaultCatalogAndSchemaTest.java index f249d0bd54..f0c497a6ef 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/boot/database/qualfiedTableNaming/DefaultCatalogAndSchemaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/boot/database/qualfiedTableNaming/DefaultCatalogAndSchemaTest.java @@ -80,7 +80,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @RunWith(CustomParameterized.class) -@TestForIssue(jiraKey = "HHH-14921") +@TestForIssue(jiraKey = { "HHH-14921", "HHH-14922" }) public class DefaultCatalogAndSchemaTest { private static final String SQL_QUOTE_CHARACTER_CLASS = "([`\"]|\\[|\\])"; @@ -127,11 +127,11 @@ public class DefaultCatalogAndSchemaTest { null, null, "someImplicitCatalog", "someImplicitSchema" } ); // HHH-14922: Inconsistent precedence of orm.xml implicit catalog/schema over "default_catalog"/"default_schema" -// params.add( new Object[] { mode, "implicit-global-catalog-and-schema.orm.xml", -// "someDefaultCatalog", "someDefaultSchema", -// // The implicit catalog/schema defined in the mapping should take precedence -// // over the default catalog/schema defined in settings. -// "someImplicitCatalog", "someImplicitSchema" } ); + params.add( new Object[] { mode, "implicit-global-catalog-and-schema.orm.xml", + "someDefaultCatalog", "someDefaultSchema", + // The implicit catalog/schema defined in the mapping should take precedence + // over the default catalog/schema defined in settings. + "someImplicitCatalog", "someImplicitSchema" } ); } return params; }