Skip to content

Commit

Permalink
HHH-16189 Wrong order by and group by generated
Browse files Browse the repository at this point in the history
  • Loading branch information
@dreab8 @beikov
dreab8 authored and beikov committed Mar 17, 2023
1 parent 75d1f36 commit 664b10a
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 15 deletions.
18 changes: 14 additions & 4 deletions hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -886,7 +886,9 @@ public void addVersionedAssignment(Consumer<Assignment> assignmentConsumer, SqmU
.get( versionMapping.getPartName() ),
this,
this,
jpaQueryComplianceEnabled ).getColumnReferences();
jpaQueryComplianceEnabled,
Clause.SET
).getColumnReferences();
assert targetColumnReferences.size() == 1;

final ColumnReference versionColumn = targetColumnReferences.get( 0 );
Expand Down Expand Up @@ -1331,7 +1333,8 @@ else if ( localName.equals( versionAttributeName ) ) {
.get( versionAttributeName ),
this,
this,
jpaQueryComplianceEnabled
jpaQueryComplianceEnabled,
getCurrentClauseStack().getCurrent()
);
final List<ColumnReference> targetColumnReferences = versionPath.getColumnReferences();
assert targetColumnReferences.size() == 1;
Expand Down Expand Up @@ -3960,7 +3963,8 @@ public Expression visitBasicValuedPath(SqmBasicValuedSimplePath<?> sqmPath) {
sqmPath,
this,
this,
jpaQueryComplianceEnabled
jpaQueryComplianceEnabled,
getCurrentClauseStack().getCurrent()
)
);
Expression result = path;
Expand Down Expand Up @@ -4058,7 +4062,13 @@ public Expression visitEmbeddableValuedPath(SqmEmbeddedValuedSimplePath<?> sqmPa
return withTreatRestriction(
prepareReusablePath(
sqmPath,
() -> EmbeddableValuedPathInterpretation.from( sqmPath, this, this, jpaQueryComplianceEnabled )
() -> EmbeddableValuedPathInterpretation.from(
sqmPath,
this,
this,
jpaQueryComplianceEnabled,
getCurrentClauseStack().getCurrent()
)
),
sqmPath
);
Expand Down
30 changes: 24 additions & 6 deletions ...ore/src/main/java/org/hibernate/query/sqm/sql/internal/BasicValuedPathInterpretation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,21 @@
import org.hibernate.metamodel.MappingMetamodel;
import org.hibernate.metamodel.mapping.BasicValuedModelPart;
import org.hibernate.metamodel.mapping.EntityMappingType;
import org.hibernate.metamodel.mapping.ManagedMappingType;
import org.hibernate.metamodel.mapping.ModelPart;
import org.hibernate.metamodel.mapping.ModelPartContainer;
import org.hibernate.metamodel.model.domain.EntityDomainType;
import org.hibernate.query.sqm.tree.from.SqmFrom;
import org.hibernate.spi.NavigablePath;
import org.hibernate.query.SemanticException;
import org.hibernate.query.sqm.SemanticQueryWalker;
import org.hibernate.query.sqm.StrictJpaComplianceViolation;
import org.hibernate.query.sqm.tree.domain.SqmBasicValuedSimplePath;
import org.hibernate.query.sqm.tree.domain.SqmTreatedPath;
import org.hibernate.sql.ast.Clause;
import org.hibernate.sql.ast.SqlAstWalker;
import org.hibernate.sql.ast.spi.FromClauseAccess;
import org.hibernate.sql.ast.spi.SqlAstCreationState;
import org.hibernate.sql.ast.spi.SqlExpressionResolver;
import org.hibernate.sql.ast.tree.expression.ColumnReference;
import org.hibernate.sql.ast.tree.expression.Expression;
import org.hibernate.sql.ast.tree.expression.SqlSelectionExpression;
Expand All @@ -43,7 +46,8 @@ public static <T> BasicValuedPathInterpretation<T> from(
SqmBasicValuedSimplePath<T> sqmPath,
SqlAstCreationState sqlAstCreationState,
SemanticQueryWalker sqmWalker,
boolean jpaQueryComplianceEnabled) {
boolean jpaQueryComplianceEnabled,
Clause currentClause) {
final FromClauseAccess fromClauseAccess = sqlAstCreationState.getFromClauseAccess();
final TableGroup tableGroup = fromClauseAccess.getTableGroup( sqmPath.getNavigablePath().getParent() );

Expand All @@ -68,10 +72,24 @@ else if ( sqmPath.getLhs().getNodeType() instanceof EntityDomainType ) {
}
}

final BasicValuedModelPart mapping = (BasicValuedModelPart) tableGroup.getModelPart().findSubPart(
sqmPath.getReferencedPathSource().getPathName(),
treatTarget
);
final ModelPartContainer modelPart = tableGroup.getModelPart();
final BasicValuedModelPart mapping;
// In the select, group by, order by and having clause we have to make sure we render the column of the target table,
// never the FK column, if the lhs is a SqmFrom i.e. something explicitly queried/joined.
if ( ( currentClause == Clause.GROUP || currentClause == Clause.SELECT || currentClause == Clause.ORDER || currentClause == Clause.HAVING )
&& sqmPath.getLhs() instanceof SqmFrom<?, ?>
&& modelPart.getPartMappingType() instanceof ManagedMappingType ) {
mapping = (BasicValuedModelPart) ( (ManagedMappingType) modelPart.getPartMappingType() ).findSubPart(
sqmPath.getReferencedPathSource().getPathName(),
treatTarget
);
}
else {
mapping = (BasicValuedModelPart) modelPart.findSubPart(
sqmPath.getReferencedPathSource().getPathName(),
treatTarget
);
}

if ( mapping == null ) {
if ( jpaQueryComplianceEnabled ) {
Expand Down
29 changes: 24 additions & 5 deletions ...rc/main/java/org/hibernate/query/sqm/sql/internal/EmbeddableValuedPathInterpretation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,16 @@
import org.hibernate.metamodel.MappingMetamodel;
import org.hibernate.metamodel.mapping.EmbeddableValuedModelPart;
import org.hibernate.metamodel.mapping.EntityMappingType;
import org.hibernate.metamodel.mapping.ManagedMappingType;
import org.hibernate.metamodel.mapping.ModelPartContainer;
import org.hibernate.metamodel.model.domain.EntityDomainType;
import org.hibernate.query.sqm.tree.from.SqmFrom;
import org.hibernate.spi.NavigablePath;
import org.hibernate.query.sqm.SemanticQueryWalker;
import org.hibernate.query.sqm.sql.SqmToSqlAstConverter;
import org.hibernate.query.sqm.tree.domain.SqmEmbeddedValuedSimplePath;
import org.hibernate.query.sqm.tree.domain.SqmTreatedPath;
import org.hibernate.sql.ast.Clause;
import org.hibernate.sql.ast.SqlAstWalker;
import org.hibernate.sql.ast.tree.expression.ColumnReference;
import org.hibernate.sql.ast.tree.expression.Expression;
Expand All @@ -39,7 +43,8 @@ public static <T> Expression from(
SqmEmbeddedValuedSimplePath<T> sqmPath,
SqmToSqlAstConverter converter,
SemanticQueryWalker<?> sqmWalker,
boolean jpaQueryComplianceEnabled) {
boolean jpaQueryComplianceEnabled,
Clause currentClause) {
TableGroup tableGroup = converter.getFromClauseAccess().findTableGroup( sqmPath.getLhs().getNavigablePath() );

EntityMappingType treatTarget = null;
Expand All @@ -61,10 +66,24 @@ else if ( sqmPath.getLhs().getNodeType() instanceof EntityDomainType ) {
}
}

final EmbeddableValuedModelPart mapping = (EmbeddableValuedModelPart) tableGroup.getModelPart().findSubPart(
sqmPath.getReferencedPathSource().getPathName(),
treatTarget
);
final ModelPartContainer modelPart = tableGroup.getModelPart();
final EmbeddableValuedModelPart mapping;
// In the select, group by, order by and having clause we have to make sure we render the column of the target table,
// never the FK column, if the lhs is a SqmFrom i.e. something explicitly queried/joined.
if ( ( currentClause == Clause.GROUP || currentClause == Clause.SELECT || currentClause == Clause.ORDER || currentClause == Clause.HAVING )
&& sqmPath.getLhs() instanceof SqmFrom<?, ?>
&& modelPart.getPartMappingType() instanceof ManagedMappingType ) {
mapping = (EmbeddableValuedModelPart) ( (ManagedMappingType) modelPart.getPartMappingType() ).findSubPart(
sqmPath.getReferencedPathSource().getPathName(),
treatTarget
);
}
else {
mapping = (EmbeddableValuedModelPart) modelPart.findSubPart(
sqmPath.getReferencedPathSource().getPathName(),
treatTarget
);
}

return new EmbeddableValuedPathInterpretation<>(
mapping.toSqlExpression(
Expand Down

0 comments on commit 664b10a

Please sign in to comment.