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 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); }