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

HHH-17483 Fix applyDiscriminator treat for nested inheritance subtypes 

Also small fix to joined-inheritance pruning.
This commit is contained in:
Marco Belladelli 2023-12-11 11:06:58 +01:00 committed by Christian Beikov
parent a788269e3b
commit 44a941a915
5 changed files with 53 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
View File

@ -2999,7 +2999,7 @@ public abstract class AbstractEntityPersister
public abstract Map<Object, String> getSubclassByDiscriminatorValue();
protected abstract boolean needsDiscriminator();
public abstract boolean needsDiscriminator();
protected boolean isDiscriminatorFormula() {
return false;
@ -3092,7 +3092,25 @@ public abstract class AbstractEntityPersister
TableGroup tableGroup,
SqlAstCreationState creationState) {
if ( needsDiscriminator() ) {
pruneForSubclasses( tableGroup, Collections.singletonMap( getEntityName(), EntityNameUse.TREAT ) );
assert !creationState.supportsEntityNameUsage() : "Entity name usage should have been used instead";
final Map<String, EntityNameUse> entityNameUseMap;
final Collection<EntityMappingType> subMappingTypes = getSubMappingTypes();
if ( subMappingTypes.isEmpty() ) {
entityNameUseMap = Collections.singletonMap( getEntityName(), EntityNameUse.TREAT );
}
else {
entityNameUseMap = new HashMap<>( 1 + subMappingTypes.size() );
entityNameUseMap.put( getEntityName(), EntityNameUse.TREAT );
// We need to register TREAT uses for all subtypes when pruning
for ( EntityMappingType subMappingType : subMappingTypes ) {
entityNameUseMap.put( subMappingType.getEntityName(), EntityNameUse.TREAT );
}
if ( isInherited() ) {
// Make sure the table group includes the root table when needed for TREAT
tableGroup.resolveTableReference( getRootTableName() );
}
}
pruneForSubclasses( tableGroup, entityNameUseMap );
}
}

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

@ -742,7 +742,7 @@ public class JoinedSubclassEntityPersister extends AbstractEntityPersister {
}
@Override
protected boolean needsDiscriminator() {
public boolean needsDiscriminator() {
return forceDiscriminator;
}
@ -1323,15 +1323,17 @@ public class JoinedSubclassEntityPersister extends AbstractEntityPersister {
final String[] subclassTableNames = persister.getSubclassTableNames();
// Build the intersection of all tables names that are of the class or super class
// These are the tables that can be safely inner joined
if ( tablesToInnerJoin.isEmpty() ) {
for ( int i = 0; i < subclassTableNames.length; i++ ) {
if ( persister.isClassOrSuperclassTable[i] ) {
tablesToInnerJoin.add( subclassTableNames[i] );
}
final Set<String> classOrSuperclassTables = new HashSet<>( subclassTableNames.length );
for ( int i = 0; i < subclassTableNames.length; i++ ) {
if ( persister.isClassOrSuperclassTable[i] ) {
classOrSuperclassTables.add( subclassTableNames[i] );
}
}
if ( tablesToInnerJoin.isEmpty() ) {
tablesToInnerJoin.addAll( classOrSuperclassTables );
}
else {
tablesToInnerJoin.retainAll( Arrays.asList( subclassTableNames ) );
tablesToInnerJoin.retainAll( classOrSuperclassTables );
}
if ( useKind == EntityNameUse.UseKind.FILTER && explicitDiscriminatorColumnName == null ) {
// If there is no discriminator column,

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

@ -548,7 +548,7 @@ public class SingleTableEntityPersister extends AbstractEntityPersister {
}
@Override
protected boolean needsDiscriminator() {
public boolean needsDiscriminator() {
return forceDiscriminator || isInherited();
}

2
hibernate-core/src/main/java/org/hibernate/persister/entity/UnionSubclassEntityPersister.java
View File

@ -286,7 +286,7 @@ public class UnionSubclassEntityPersister extends AbstractEntityPersister {
}
@Override
protected boolean needsDiscriminator() {
public boolean needsDiscriminator() {
return false;
}

32
hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java
View File

@ -3118,20 +3118,30 @@ public abstract class BaseSqmToSqlAstConverter<T extends Statement> extends Base
);
}
}
if ( useKind == EntityNameUse.UseKind.TREAT || useKind == EntityNameUse.UseKind.PROJECTION ) {
// If we encounter a treat use, we also want register the use for all subtypes.
// We do this here to not have to expand entity name uses during pruning later on
// If we encounter a treat or projection use, we also want register the use for all subtypes.
// We do this here to not have to expand entity name uses during pruning later on
if ( useKind == EntityNameUse.UseKind.TREAT ) {
for ( EntityMappingType subType : persister.getSubMappingTypes() ) {
entityNameUses.compute(
subType.getEntityName(),
(s, existingUse) -> finalEntityNameUse.stronger( existingUse )
);
if ( useKind == EntityNameUse.UseKind.PROJECTION ) {
actualTableGroup.resolveTableReference(
null,
subType.getEntityPersister().getMappedTableDetails().getTableName()
);
}
}
if ( persister.isInherited() && persister.needsDiscriminator() ) {
// Make sure the table group includes the root table when needed for TREAT
actualTableGroup.resolveTableReference( persister.getRootTableName() );
}
}
else if ( useKind == EntityNameUse.UseKind.PROJECTION ) {
for ( EntityMappingType subType : persister.getSubMappingTypes() ) {
entityNameUses.compute(
subType.getEntityName(),
(s, existingUse) -> finalEntityNameUse.stronger( existingUse )
);
actualTableGroup.resolveTableReference(
null,
subType.getEntityPersister().getMappedTableDetails().getTableName()
);
}
}
}
@ -8238,7 +8248,9 @@ public abstract class BaseSqmToSqlAstConverter<T extends Statement> extends Base
if ( entityMappingType.getSuperMappingType() != null ) {
// A joined table group was created by an enabled entity graph or fetch profile,
// and it's of an inheritance subtype, so we should apply the discriminator
entityMappingType.applyDiscriminator( null, null, actualTableGroup, this );
getCurrentClauseStack().push( Clause.FROM );
registerEntityNameUsage( actualTableGroup, EntityNameUse.TREAT, entityMappingType.getEntityName() );
getCurrentClauseStack().pop();
}
}
}