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

HHH-18503 Register root table name usage for persisters with physical discriminators

This commit is contained in:
Marco Belladelli 2024-08-20 10:29:57 +02:00
parent ecf4c29a60
commit 67269a6137
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5810,8 +5810,7 @@ public abstract class AbstractEntityPersister
private ModelPart getIdentifierModelPart(String name, EntityMappingType treatTargetType) { private ModelPart getIdentifierModelPart(String name, EntityMappingType treatTargetType) {
final EntityIdentifierMapping identifierMapping = getIdentifierMappingForJoin(); final EntityIdentifierMapping identifierMapping = getIdentifierMappingForJoin();
if ( identifierMapping instanceof NonAggregatedIdentifierMapping ) { if ( identifierMapping instanceof final NonAggregatedIdentifierMapping mapping ) {
NonAggregatedIdentifierMapping mapping = (NonAggregatedIdentifierMapping) identifierMapping;
final ModelPart subPart = mapping.findSubPart( name, treatTargetType ); final ModelPart subPart = mapping.findSubPart( name, treatTargetType );
if ( subPart != null ) { if ( subPart != null ) {
return subPart; return subPart;

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

@ -3022,10 +3022,20 @@ public abstract class BaseSqmToSqlAstConverter<T extends Statement> extends Base
parentType.getRootEntityDescriptor().getEntityName() parentType.getRootEntityDescriptor().getEntityName()
); );
} }
final EntityDiscriminatorMapping discriminator = parentType.getDiscriminatorMapping();
final String entityName;
if ( discriminator != null && discriminator.hasPhysicalColumn() && !parentType.getSubMappingTypes().isEmpty() ) {
// This is needed to preserve optimization for joined + discriminator inheritance
// see JoinedSubclassEntityPersister#getIdentifierMappingForJoin
entityName = parentType.getRootEntityDescriptor().getEntityName();
}
else {
entityName = parentType.getEntityName();
}
registerEntityNameUsage( registerEntityNameUsage(
tableGroup, tableGroup,
EntityNameUse.EXPRESSION, EntityNameUse.EXPRESSION,
parentType.getEntityName() entityName
); );
} }
else { else {