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

HHH-16165 Incorrect SQL generated when using SELECT DISTINCT and @OrderBy

This commit is contained in:
Andrea Boriero 2023-02-10 12:23:11 +01:00 committed by Christian Beikov
parent 24d1aa67fc
commit 91e3a38122
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractDomainPath.java
View File

@ -19,6 +19,7 @@ import org.hibernate.metamodel.mapping.ordering.ast.OrderingExpression;
import org.hibernate.query.sqm.NullPrecedence; import org.hibernate.query.sqm.NullPrecedence;
import org.hibernate.query.sqm.SortOrder; import org.hibernate.query.sqm.SortOrder;
import org.hibernate.sql.ast.spi.SqlAstCreationState; import org.hibernate.sql.ast.spi.SqlAstCreationState;
import org.hibernate.sql.ast.spi.SqlSelection;
import org.hibernate.sql.ast.tree.SqlAstNode; import org.hibernate.sql.ast.tree.SqlAstNode;
import org.hibernate.sql.ast.tree.expression.ColumnReference; import org.hibernate.sql.ast.tree.expression.ColumnReference;
import org.hibernate.sql.ast.tree.expression.Expression; import org.hibernate.sql.ast.tree.expression.Expression;
@ -26,8 +27,10 @@ import org.hibernate.sql.ast.tree.expression.SqlTuple;
import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.ast.tree.from.TableGroup;
import org.hibernate.sql.ast.tree.from.TableReference; import org.hibernate.sql.ast.tree.from.TableReference;
import org.hibernate.sql.ast.tree.select.QuerySpec; import org.hibernate.sql.ast.tree.select.QuerySpec;
import org.hibernate.sql.ast.tree.select.SelectClause;
import org.hibernate.sql.ast.tree.select.SortSpecification; import org.hibernate.sql.ast.tree.select.SortSpecification;
import org.hibernate.sql.results.graph.Fetchable; import org.hibernate.sql.results.graph.Fetchable;
import org.hibernate.sql.results.internal.SqlSelectionImpl;
import static org.hibernate.sql.ast.spi.SqlExpressionResolver.createColumnReferenceKey; import static org.hibernate.sql.ast.spi.SqlExpressionResolver.createColumnReferenceKey;
@ -258,6 +261,19 @@ public abstract class AbstractDomainPath implements DomainPath {
} }
} }
} }
final SelectClause selectClause = ast.getSelectClause();
if ( selectClause.isDistinct() && selectClauseDoesNotContainOrderExpression( expression, selectClause ) ) {
final int valuesArrayPosition = selectClause.getSqlSelections().size();
SqlSelection sqlSelection = new SqlSelectionImpl(
valuesArrayPosition + 1,
valuesArrayPosition,
expression
);
selectClause.addSqlSelection( sqlSelection );
}
final Expression sortExpression = OrderingExpression.applyCollation( final Expression sortExpression = OrderingExpression.applyCollation(
expression, expression,
collation, collation,
@ -265,4 +281,13 @@ public abstract class AbstractDomainPath implements DomainPath {
); );
ast.addSortSpecification( new SortSpecification( sortExpression, sortOrder, nullPrecedence ) ); ast.addSortSpecification( new SortSpecification( sortExpression, sortOrder, nullPrecedence ) );
} }
private static boolean selectClauseDoesNotContainOrderExpression(Expression expression, SelectClause selectClause) {
for ( SqlSelection sqlSelection : selectClause.getSqlSelections() ) {
if ( sqlSelection.getExpression().equals( expression ) ) {
return false;
}
}
return true;
}
} }