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

HHH-16642 Restrict conjuct type predicate to treated roots

Browse Source
This commit is contained in:
Marco Belladelli 2023-06-16 16:05:55 +02:00
parent 00d13050f1
commit 4095e16212
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2990,7 +2990,7 @@ private void registerPathAttributeEntityNameUsage(SqmPath<?> sqmPath, TableGroup
entityNameUse = EntityNameUse.OPTIONAL_TREAT; entityNameUse = EntityNameUse.OPTIONAL_TREAT;
} }
else { else {
entityNameUse = EntityNameUse.TREAT; entityNameUse = EntityNameUse.BASE_TREAT;
} }
registerEntityNameUsage( registerEntityNameUsage(
tableGroup, tableGroup,
@ -5005,12 +5005,16 @@ private Expression withTreatRestriction(Expression expression, SqmPath<?> path)
} }
if ( !( expression.getExpressionType() instanceof BasicValuedMapping ) ) { if ( !( expression.getExpressionType() instanceof BasicValuedMapping ) ) {
// A case wrapper for non-basic paths is not possible, // A case wrapper for non-basic paths is not possible,
// because a case expression must return a scalar value, // because a case expression must return a scalar value.
// so we instead add the type restriction predicate as conjunct if ( lhs instanceof SqmRoot ) {
// by registering the treat into tableGroupEntityNameUses // For treated roots we need to add the type restriction predicate as conjunct
final String treatedName = treatedPath.getTreatTarget().getHibernateEntityName(); // by registering the treat into tableGroupEntityNameUses.
final TableGroup tableGroup = getFromClauseIndex().findTableGroup( wrappedPath.getNavigablePath() ); // Joins don't need the restriction as it will be embedded into
registerEntityNameUsage( tableGroup, EntityNameUse.TREAT, treatedName ); // the joined table group itself by #pruneTableGroupJoins
final String treatedName = treatedPath.getTreatTarget().getHibernateEntityName();
final TableGroup tableGroup = getFromClauseIndex().findTableGroup( wrappedPath.getNavigablePath() );
registerEntityNameUsage( tableGroup, EntityNameUse.TREAT, treatedName );
}
return expression; return expression;
} }
final BasicValuedPathInterpretation<?> basicPath = (BasicValuedPathInterpretation<?>) expression; final BasicValuedPathInterpretation<?> basicPath = (BasicValuedPathInterpretation<?>) expression;