Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-13226 Avoid changing existing changelog and complete the backwards compatibility work

This commit is contained in:
Sanne Grinovero 2019-07-12 10:45:15 +01:00
parent 74b4c97552
commit d18b38c504
7 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelog.txt
View File

@ -1941,7 +1941,7 @@ https://hibernate.atlassian.net/projects/HHH/versions/22050
* [HHH-10223] - Element 'query-param' in *.hbm.xml files causes ClassCastException
* [HHH-10252] - Cascade delete does not work for instrumented/enhanced entities
* [HHH-10286] - SessionFactoryImpl doesn't cache and reuse existing collection cache region access strategies
* [HHH-10298] - Add new configuration type hibernate.hbm2ddl.extra_physical_table_types
* [HHH-10298] - Add new configuration type hibernate.hbm2dll.extra_physical_table_types
* [HHH-10331] - HSQLDialect returns supportsTupleDistinctCounts false which seems wrong
* [HHH-10343] - Precision and scale are reversed when using decimal as element in map
* [HHH-10344] - Bring transaction invalidation interceptor into Infinispan 2LC

16
hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java
View File

@ -1468,7 +1468,7 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings {
String HBM2DLL_CREATE_NAMESPACES = "hibernate.hbm2dll.create_namespaces";
/**
* The JPA variant of {@link #HBM2DLL_CREATE_NAMESPACES}
* The JPA variant of {@link #HBM2DDL_CREATE_NAMESPACES}
* <p/>
* Specifies whether the persistence provider is to create the database schema(s) in addition to creating
* database objects (tables, sequences, constraints, etc). The value of this boolean property should be set
@ -1476,7 +1476,13 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings {
* contains "CREATE SCHEMA" commands. If this property is not supplied (or is explicitly {@code false}), the
* provider should not attempt to create database schemas.
*/
String HBM2DLL_CREATE_SCHEMAS = "javax.persistence.create-database-schemas";
String HBM2DDL_CREATE_SCHEMAS = "javax.persistence.create-database-schemas";
/**
* @deprecated Use {@link #HBM2DDL_CREATE_SCHEMAS} instead: this variable name had a typo.
*/
@Deprecated
String HBM2DLL_CREATE_SCHEMAS = HBM2DDL_CREATE_SCHEMAS;
/**
* Used to specify the {@link org.hibernate.tool.schema.spi.SchemaFilterProvider} to be used by
@ -1683,6 +1689,12 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings {
*/
String EXTRA_PHYSICAL_TABLE_TYPES = "hibernate.hbm2ddl.extra_physical_table_types";
/**
* @deprecated use {@link #EXTRA_PHYSICAL_TABLE_TYPES} instead.
*/
@Deprecated
String DEPRECATED_EXTRA_PHYSICAL_TABLE_TYPES = "hibernate.hbm2dll.extra_physical_table_types";
/**
* Unique columns and unique keys both use unique constraints in most dialects.
* SchemaUpdate needs to create these constraints, but DB's

6
hibernate-core/src/main/java/org/hibernate/jpa/AvailableSettings.java
View File

@ -187,11 +187,11 @@ public interface AvailableSettings {
String SCHEMA_GEN_SCRIPTS_DROP_TARGET = org.hibernate.cfg.AvailableSettings.HBM2DDL_SCRIPTS_DROP_TARGET;
/**
* @deprecated (since 5.2) use {@link org.hibernate.cfg.AvailableSettings#HBM2DLL_CREATE_NAMESPACES}
* or {@link org.hibernate.cfg.AvailableSettings#HBM2DLL_CREATE_SCHEMAS} instead
* @deprecated (since 5.2) use {@link org.hibernate.cfg.AvailableSettings#HBM2DDL_CREATE_NAMESPACES}
* or {@link org.hibernate.cfg.AvailableSettings#HBM2DDL_CREATE_SCHEMAS} instead
*/
@Deprecated
String SCHEMA_GEN_CREATE_SCHEMAS = org.hibernate.cfg.AvailableSettings.HBM2DLL_CREATE_NAMESPACES;
String SCHEMA_GEN_CREATE_SCHEMAS = org.hibernate.cfg.AvailableSettings.HBM2DDL_CREATE_NAMESPACES;
/**
* @deprecated (since 5.2) use {@link org.hibernate.cfg.AvailableSettings#HBM2DDL_CONNECTION} instead

6
hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/InformationExtractorJdbcDatabaseMetaDataImpl.java
View File

@ -66,7 +66,11 @@ public class InformationExtractorJdbcDatabaseMetaDataImpl implements Information
final String extraPhysycalTableTypesConfig = configService.getSetting(
AvailableSettings.EXTRA_PHYSICAL_TABLE_TYPES,
StandardConverters.STRING,
""
configService.getSetting(
AvailableSettings.DEPRECATED_EXTRA_PHYSICAL_TABLE_TYPES,
StandardConverters.STRING,
""
)
);
if ( !"".equals( extraPhysycalTableTypesConfig.trim() ) ) {
this.extraPhysicalTableTypes = StringHelper.splitTrimmingTokens(

10
hibernate-core/src/main/java/org/hibernate/tool/schema/internal/Helper.java
View File

@ -105,12 +105,18 @@ public class Helper {
public static boolean interpretNamespaceHandling(Map configurationValues) {
// prefer the JPA setting...
return ConfigurationHelper.getBoolean(
AvailableSettings.HBM2DLL_CREATE_SCHEMAS,
AvailableSettings.HBM2DDL_CREATE_SCHEMAS,
configurationValues,
//Then try the Hibernate ORM setting:
ConfigurationHelper.getBoolean(
AvailableSettings.HBM2DDL_CREATE_NAMESPACES,
configurationValues,
false
//And finally fall back to the old name this had before we fixed the typo:
ConfigurationHelper.getBoolean(
AvailableSettings.HBM2DLL_CREATE_NAMESPACES,
configurationValues,
false
)
)
);
}

2
hibernate-core/src/test/java/org/hibernate/test/schemaupdate/QuotedTableNameSchemaUpdateTest.java
View File

@ -48,7 +48,7 @@ public class QuotedTableNameSchemaUpdateTest extends BaseUnitTestCase {
public void setUp() throws IOException {
output = File.createTempFile( "update_script", ".sql" );
output.deleteOnExit();
ssr = new StandardServiceRegistryBuilder().applySetting( AvailableSettings.HBM2DLL_CREATE_SCHEMAS, "true" )
ssr = new StandardServiceRegistryBuilder().applySetting( AvailableSettings.HBM2DDL_CREATE_SCHEMAS, "true" )
.build();
}

2
hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/crossschema/CrossSchemaForeignKeyGenerationTest.java
View File

@ -68,7 +68,7 @@ public class CrossSchemaForeignKeyGenerationTest extends BaseUnitTestCase {
public void setUp() throws IOException {
output = File.createTempFile( "update_script", ".sql" );
output.deleteOnExit();
ssr = new StandardServiceRegistryBuilder().applySetting( AvailableSettings.HBM2DLL_CREATE_SCHEMAS, "true" )
ssr = new StandardServiceRegistryBuilder().applySetting( AvailableSettings.HBM2DDL_CREATE_SCHEMAS, "true" )
.build();
}