From 3ec74e0d8bdb8452fbb24ef7c2de20c2b5364fe3 Mon Sep 17 00:00:00 2001 From: Jurgen <5031427+Jugen@users.noreply.github.com> Date: Thu, 8 Feb 2024 15:56:33 +0200 Subject: [PATCH] Updated to not compare column alias --- .../cayenne/access/translator/select/OrderingStage.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/select/OrderingStage.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/select/OrderingStage.java index 9f7a9a5941..ea747a3c01 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/translator/select/OrderingStage.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/translator/select/OrderingStage.java @@ -21,6 +21,7 @@ import org.apache.cayenne.access.sqlbuilder.NodeBuilder; import org.apache.cayenne.access.sqlbuilder.OrderingNodeBuilder; +import org.apache.cayenne.access.sqlbuilder.StringBuilderAppendable; import org.apache.cayenne.access.sqlbuilder.sqltree.Node; import org.apache.cayenne.exp.Expression; import org.apache.cayenne.exp.parser.ASTAggregateFunctionCall; @@ -57,10 +58,11 @@ private void processOrdering(QualifierTranslator qualifierTranslator, Translator // If query is DISTINCT then we need to add all ORDER BY clauses as result columns if(!context.isDistinctSuppression()) { // Duplicate column check - String nodeStr = translatedNode.toString(); + String orderStr = translatedNode.append(new StringBuilderAppendable()).append(' ').toString(); boolean isNotPresent = context.getResultNodeList().stream() - .map( result -> result.getNode().toString() ) - .noneMatch( node -> node.equals( nodeStr ) ); + .map( result -> result.getNode().append(new StringBuilderAppendable()).append(' ') ) + // the column may have an alias so just check that the orderStr part matches + .noneMatch( column -> column.toString().startsWith( orderStr ) ); if ( isNotPresent ) { // deepCopy as some DB expect exactly the same expression in select and in ordering