Skip to content

Commit 54a3bb2

Browse files
committed
HHH-10014 - Adjust default for hibernate.auto_quote_keyword to false
1 parent 45dd596 commit 54a3bb2

File tree

4 files changed

+17
-8
lines changed

4 files changed

+17
-8
lines changed

hibernate-core/src/test/java/org/hibernate/test/jdbc/env/TestKeywordRecognition.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import org.hibernate.boot.model.naming.Identifier;
1010
import org.hibernate.boot.registry.StandardServiceRegistry;
1111
import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
12-
import org.hibernate.engine.jdbc.env.spi.AnsiSqlKeywords;
12+
import org.hibernate.cfg.AvailableSettings;
1313
import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
1414

1515
import org.hibernate.testing.TestForIssue;
@@ -28,7 +28,9 @@ public class TestKeywordRecognition extends BaseUnitTestCase {
2828

2929
@Before
3030
public void prepareServiveRegistry() {
31-
serviceRegistry = new StandardServiceRegistryBuilder().build();
31+
serviceRegistry = new StandardServiceRegistryBuilder()
32+
.applySetting( AvailableSettings.KEYWORD_AUTO_QUOTING_ENABLED, "true" )
33+
.build();
3234
}
3335

3436
@After

hibernate-core/src/test/java/org/hibernate/test/legacy/SQLLoaderTest.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
import org.hibernate.SQLQuery;
1919
import org.hibernate.Session;
2020
import org.hibernate.Transaction;
21+
import org.hibernate.cfg.AvailableSettings;
22+
import org.hibernate.cfg.Configuration;
2123
import org.hibernate.dialect.Dialect;
2224
import org.hibernate.dialect.HSQLDialect;
2325
import org.hibernate.dialect.MySQLDialect;
@@ -42,6 +44,13 @@ public class SQLLoaderTest extends LegacyTestCase {
4244
static int nextInt = 1;
4345
static long nextLong = 1;
4446

47+
@Override
48+
public void configure(Configuration cfg) {
49+
super.configure( cfg );
50+
51+
cfg.setProperty( AvailableSettings.KEYWORD_AUTO_QUOTING_ENABLED, "true" );
52+
}
53+
4554
@Override
4655
public String[] getMappings() {
4756
return new String[] {

hibernate-core/src/test/java/org/hibernate/test/namingstrategy/complete/LegacyJpaNamingWithAnnotationBindingTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ else if ( pass == 3 ) {
6868

6969
@Override
7070
protected void validateOrderPrimaryTableName(String name) {
71-
assertEquals( "`Order`", name );
71+
assertEquals( "Order", name );
7272
}
7373

7474
@Override
@@ -172,7 +172,7 @@ else if ( pass == 3 ) {
172172

173173
@Override
174174
protected void validateCustomerOrdersTableName(String name) {
175-
assertEquals( "`Order`", name );
175+
assertEquals( "Order", name );
176176
}
177177

178178
@Override

hibernate-core/src/test/java/org/hibernate/test/namingstrategy/complete/LegacyJpaNamingWithHbmBindingTests.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,7 @@ else if ( pass == 3 ) {
7474

7575
@Override
7676
protected void validateOrderPrimaryTableName(String name) {
77-
// quoted because "order" is an ansi sql keyword
78-
assertEquals( "`Order`", name );
77+
assertEquals( "Order", name );
7978
}
8079

8180
@Override
@@ -175,8 +174,7 @@ else if ( pass == 3 ) {
175174

176175
@Override
177176
protected void validateCustomerOrdersTableName(String name) {
178-
// quoted because "order" is an ansi sql keyword
179-
assertEquals( "`Order`", name );
177+
assertEquals( "Order", name );
180178
}
181179

182180
@Override

0 commit comments

Comments
 (0)