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

Don't create table groups for the plural path of a plural part path

This commit is contained in:
Christian Beikov 2022-02-08 10:52:12 +01:00
parent 89bf82fee4
commit 4e19e322a3
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2803,37 +2803,46 @@ public abstract class BaseSqmToSqlAstConverter<T extends Statement> extends Base
return tableGroup;
}
private void prepareForSelection(SqmPath<?> joinedPath) {
private void prepareForSelection(SqmPath<?> selectionPath) {
final SqmPath<?> path;
// Don't create joins for plural part paths as that will be handled
// through a cardinality preserving mechanism in visitIndexAggregateFunction/visitElementAggregateFunction
if ( selectionPath instanceof AbstractSqmSpecificPluralPartPath<?> ) {
path = selectionPath.getLhs().getLhs();
}
else {
path = selectionPath;
}
final FromClauseIndex fromClauseIndex = getFromClauseIndex();
final TableGroup tableGroup = fromClauseIndex.findTableGroup( joinedPath.getNavigablePath() );
final TableGroup tableGroup = fromClauseIndex.findTableGroup( path.getNavigablePath() );
if ( tableGroup == null ) {
prepareReusablePath( joinedPath, () -> null );
prepareReusablePath( path, () -> null );
final NavigablePath navigablePath;
if ( CollectionPart.Nature.fromNameExact( joinedPath.getNavigablePath().getUnaliasedLocalName() ) != null ) {
navigablePath = joinedPath.getLhs().getLhs().getNavigablePath();
if ( CollectionPart.Nature.fromNameExact( path.getNavigablePath().getUnaliasedLocalName() ) != null ) {
navigablePath = path.getLhs().getLhs().getNavigablePath();
}
else if ( joinedPath instanceof SqmTreatedRoot<?, ?> ) {
navigablePath = ( (SqmTreatedRoot<?, ?>) joinedPath ).getWrappedPath().getNavigablePath();
else if ( path instanceof SqmTreatedRoot<?, ?> ) {
navigablePath = ( (SqmTreatedRoot<?, ?>) path ).getWrappedPath().getNavigablePath();
}
else {
navigablePath = joinedPath.getLhs().getNavigablePath();
navigablePath = path.getLhs().getNavigablePath();
}
final TableGroup createdTableGroup = createTableGroup(
fromClauseIndex.getTableGroup( navigablePath ),
joinedPath
path
);
if ( createdTableGroup != null ) {
if ( joinedPath instanceof SqmTreatedPath<?, ?> ) {
fromClauseIndex.register( joinedPath, createdTableGroup );
if ( path instanceof SqmTreatedPath<?, ?> ) {
fromClauseIndex.register( path, createdTableGroup );
}
if ( joinedPath instanceof SqmFrom<?, ?> ) {
registerTreatUsage( (SqmFrom<?, ?>) joinedPath, createdTableGroup );
if ( path instanceof SqmFrom<?, ?> ) {
registerTreatUsage( (SqmFrom<?, ?>) path, createdTableGroup );
}
}
}
else if ( joinedPath instanceof SqmFrom<?, ?> ) {
registerTreatUsage( (SqmFrom<?, ?>) joinedPath, tableGroup );
else if ( path instanceof SqmFrom<?, ?> ) {
registerTreatUsage( (SqmFrom<?, ?>) path, tableGroup );
}
}