From 35a6ff7f0223880f018f479c910ef004cee52dea Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 23 Sep 2021 18:48:40 +1200
Subject: [PATCH] #2392 - Oracle specific singleAttribute distinct query - not
 include the column twice with order by clause

---
 .../main/java/io/ebeaninternal/server/query/CQueryBuilder.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
index 8d4ebbdd9..87a9f9b10 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
@@ -583,7 +583,7 @@ final class CQueryBuilder {
           final OrderBy<?> orderBy = query.getOrderBy();
           if (orderBy != null && orderBy.supportsSelect()) {
             String trimmed = DbOrderByTrim.trim(dbOrderBy);
-            if (query.isSingleAttribute() && trimmed.equals(select.getSelectSql())) {
+            if (query.isSingleAttribute() && select.getSelectSql().startsWith(trimmed)) {
               // NOP, already in SQL
               // TODO: what to do if we select("id").orderBy("prop,id")?
               // Can we live with a query like "select t0.id, t0.prop, t0.id from"