From 985229f9a7854260a47784d3cfd228f4a8ed9042 Mon Sep 17 00:00:00 2001 From: Vlad Mihalcea Date: Thu, 31 Mar 2016 09:09:02 +0300 Subject: [PATCH] HHH-10662 - Fix inconsistencies between quoting-related configuration properties JavaDocs and their default values assigned at the code level --- .../src/main/java/org/hibernate/cfg/AvailableSettings.java | 2 +- .../engine/jdbc/env/internal/JdbcEnvironmentImpl.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java index 23770c775e..09beda4f29 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java @@ -399,7 +399,7 @@ public interface AvailableSettings { /** * Specifies whether to automatically quote any names that are deemed keywords. Auto-quoting - * is enabled by default. Set to false to disable. + * is disabled by default. Set to true to enable it. * * @since 5.0 */ diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentImpl.java index 977f9b83bf..bbf904044c 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentImpl.java @@ -32,9 +32,9 @@ import org.hibernate.engine.jdbc.spi.TypeInfo; import org.hibernate.exception.internal.SQLExceptionTypeDelegate; import org.hibernate.exception.internal.SQLStateConversionDelegate; import org.hibernate.exception.internal.StandardSQLExceptionConverter; -import org.hibernate.internal.util.config.ConfigurationHelper; import org.hibernate.service.ServiceRegistry; import org.hibernate.service.spi.ServiceRegistryImplementor; + import org.jboss.logging.Logger; /** @@ -128,8 +128,7 @@ public class JdbcEnvironmentImpl implements JdbcEnvironment { return cfgService.getSetting( AvailableSettings.GLOBALLY_QUOTED_IDENTIFIERS_SKIP_COLUMN_DEFINITIONS, StandardConverters.BOOLEAN, - // default is true for JPA compliance - DO NOT CHANGE! - true + false ); }