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

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

This commit is contained in:
Gail Badner 2019-07-16 22:22:18 -07:00
parent ea761ec439
commit 18f9c142e3
2 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -247,11 +247,7 @@ public class JoinedSubclassEntityPersister extends AbstractEntityPersister {
for ( int tableIndex = 0; joinItr.hasNext(); tableIndex++ ) {
Join join = (Join) joinItr.next();
isNullableTable[tableIndex] = join.isOptional() ||
creationContext.getSessionFactory()
.getSessionFactoryOptions()
.getJpaCompliance()
.isJpaCacheComplianceEnabled();
isNullableTable[tableIndex] = join.isOptional();
isInverseTable[tableIndex] = join.isInverse();
Table table = join.getTable();
@ -320,12 +316,7 @@ public class JoinedSubclassEntityPersister extends AbstractEntityPersister {
isConcretes.add( persistentClass.isClassOrSuperclassTable( joinTable ) );
isDeferreds.add( join.isSequentialSelect() );
isInverses.add( join.isInverse() );
isNullables.add(
join.isOptional() || creationContext.getSessionFactory()
.getSessionFactoryOptions()
.getJpaCompliance()
.isJpaCacheComplianceEnabled()
);
isNullables.add( join.isOptional() );
isLazies.add( join.isLazy() );
String joinTableName = determineTableName( joinTable, jdbcEnvironment );
@ -423,11 +414,7 @@ public class JoinedSubclassEntityPersister extends AbstractEntityPersister {
Join join = (Join) joinItr.next();
isInverseTable[j] = join.isInverse();
isNullableTable[j] = join.isOptional()
|| creationContext.getSessionFactory()
.getSessionFactoryOptions()
.getJpaCompliance()
.isJpaCacheComplianceEnabled();
isNullableTable[j] = join.isOptional();
customSQLInsert[j] = join.getCustomSQLInsert();
insertCallable[j] = customSQLInsert[j] != null && join.isCustomInsertCallable();

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

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