From 4d16cf9caac83ee2cffc9f9aca12f63c1640ed46 Mon Sep 17 00:00:00 2001
From: Matus Zamborsky <zamborsky@inqool.cz>
Date: Mon, 1 Aug 2016 10:13:05 +0200
Subject: [PATCH] Add check for distinct query when adding id attribute to
 order clause in paging query

---
 .../com/avaje/ebeaninternal/server/query/CQueryEngine.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryEngine.java b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryEngine.java
index 425e488f8..0818ca8ca 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryEngine.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryEngine.java
@@ -300,9 +300,10 @@ public class CQueryEngine {
 
 
     SpiQuery<T> query = request.getQuery();
-    if (query.getMaxRows() > 1 || query.getFirstRow() > 0) {
+    if (!query.isDistinct() && (query.getMaxRows() > 1 || query.getFirstRow() > 0)) {
       // deemed to be a be a paging query - check that the order by contains
       // the id property to ensure unique row ordering for predicable paging
+      // but only in case, this is not a distinct query
       request.getBeanDescriptor().appendOrderById(query);
     }