Hibernate/hibernate-orm
1
0
Fork 0
mirror of https://github.com/hibernate/hibernate-orm synced 2025-02-13 14:44:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

HHH-13424 : Table nullability should not depend on JpaCompliance.isJpaCacheComplianceEnabled()

Browse Source 
(cherry picked from commit 18f9c142e3752cca0ebc5b595c9976a1cd6e3043)
This commit is contained in:
Gail Badner 2019-07-16 22:22:18 -07:00 committed by gbadner
parent d7020cb4b3
commit 46944d4412
2 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hibernate-core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java
View File

@ -243,12 +243,7 @@ else if ( persistentClass.isDiscriminatorValueNotNull() ) {
while ( joinItr.hasNext() ) { while ( joinItr.hasNext() ) {
Join join = (Join) joinItr.next(); Join join = (Join) joinItr.next();
isNullableTable[tableIndex++] = join.isOptional() || isNullableTable[tableIndex] = join.isOptional();
creationContext.getSessionFactory()
.getSessionFactoryOptions()
.getJpaCompliance()
.isJpaCacheComplianceEnabled();
Table table = join.getTable(); Table table = join.getTable();
final String tableName = determineTableName( table, jdbcEnvironment ); final String tableName = determineTableName( table, jdbcEnvironment );

13
hibernate-core/src/main/java/org/hibernate/persister/entity/SingleTableEntityPersister.java
View File

@ -178,11 +178,7 @@ public SingleTableEntityPersister(
Join join = (Join) joinIter.next(); Join join = (Join) joinIter.next();
qualifiedTableNames[j] = determineTableName( join.getTable(), jdbcEnvironment ); qualifiedTableNames[j] = determineTableName( join.getTable(), jdbcEnvironment );
isInverseTable[j] = join.isInverse(); isInverseTable[j] = join.isInverse();
isNullableTable[j] = join.isOptional() isNullableTable[j] = join.isOptional();
|| creationContext.getSessionFactory()
.getSessionFactoryOptions()
.getJpaCompliance()
.isJpaCacheComplianceEnabled();
cascadeDeleteEnabled[j] = join.getKey().isCascadeDeleteEnabled() && cascadeDeleteEnabled[j] = join.getKey().isCascadeDeleteEnabled() &&
factory.getDialect().supportsCascadeDelete(); factory.getDialect().supportsCascadeDelete();
@ -248,12 +244,7 @@ public SingleTableEntityPersister(
isConcretes.add( persistentClass.isClassOrSuperclassJoin( join ) ); isConcretes.add( persistentClass.isClassOrSuperclassJoin( join ) );
isDeferreds.add( join.isSequentialSelect() ); isDeferreds.add( join.isSequentialSelect() );
isInverses.add( join.isInverse() ); isInverses.add( join.isInverse() );
isNullables.add( isNullables.add( join.isOptional() );
join.isOptional() || creationContext.getSessionFactory()
.getSessionFactoryOptions()
.getJpaCompliance()
.isJpaCacheComplianceEnabled()
);
isLazies.add( lazyAvailable && join.isLazy() ); isLazies.add( lazyAvailable && join.isLazy() );
if ( join.isSequentialSelect() && !persistentClass.isClassOrSuperclassJoin( join ) ) { if ( join.isSequentialSelect() && !persistentClass.isClassOrSuperclassJoin( join ) ) {
hasDeferred = true; hasDeferred = true;