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

HHH-17096 Always initialize table group for subtype treated joins

This commit is contained in:
Marco Belladelli 2024-02-14 09:46:57 +01:00
parent 7eb8aac96d
commit eb11676479
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3100,8 +3100,11 @@ public abstract class BaseSqmToSqlAstConverter<T extends Statement> extends Base
(s, existingUse) -> finalEntityNameUse.stronger( existingUse )
);
// Resolve the table reference for all types which we register an entity name use for
if ( actualTableGroup.isInitialized() ) {
// Resolve the table reference for all types which we register an entity name use for.
// Also, force table group initialization for treats when needed to ensure correct cardinality
final EntityNameUse.UseKind useKind = finalEntityNameUse.getKind();
if ( actualTableGroup.isInitialized() || ( useKind == EntityNameUse.UseKind.TREAT && actualTableGroup.canUseInnerJoins()
&& !( (EntityMappingType) actualTableGroup.getModelPart().getPartMappingType() ).isTypeOrSuperType( persister ) ) ) {
actualTableGroup.resolveTableReference( null, persister.getTableName() );
}
@ -3118,7 +3121,6 @@ public abstract class BaseSqmToSqlAstConverter<T extends Statement> extends Base
// 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
final EntityNameUse.UseKind useKind = finalEntityNameUse.getKind();
if ( useKind == EntityNameUse.UseKind.TREAT ) {
for ( EntityMappingType subType : persister.getSubMappingTypes() ) {
entityNameUses.compute(