You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2024/02/20 13:07:03 UTC
(cayenne) 01/01: Merge pull request #605 from Jugen/remove-duplicate-columns-on-distinct-and-orderBy
This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit 8faf7194df13967853b5598d1f1fcd09c3c37fef
Merge: 9dd8eae75 99138fbcf
Author: Nikita Timofeev <st...@users.noreply.github.com>
AuthorDate: Tue Feb 20 17:06:57 2024 +0400
Merge pull request #605 from Jugen/remove-duplicate-columns-on-distinct-and-orderBy
CAY-2842 Prevent duplicate select columns when using distinct with order by
.../access/sqlbuilder/sqltree/AliasedNode.java | 2 +-
.../translator/select/DefaultSelectTranslator.java | 2 +
.../access/translator/select/DistinctStage.java | 17 +---
.../access/translator/select/GroupByStage.java | 26 +----
.../translator/select/OrderingAbstractStage.java | 107 +++++++++++++++++++++
...GroupByStage.java => OrderingDistictStage.java} | 42 +++-----
...GroupByStage.java => OrderingGroupByStage.java} | 37 ++-----
.../access/translator/select/OrderingStage.java | 11 ---
.../access/translator/select/TableTree.java | 15 +++
.../translator/select/TranslatorContext.java | 28 ++++++
.../translator/select/OrderingStageTest.java | 13 +++
11 files changed, 190 insertions(+), 110 deletions(-)