Fix orderby handling

querydsl · Apr 17, 2016 · 7c81fd0 · 7c81fd0
1 parent c1d1638
commit 7c81fd0
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPAQueryMixin.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPAQueryMixin.java
@@ -142,6 +142,7 @@ private <T> Path<T> convertPathForOrder(Path<T> path) {
         if (metadata.getParent() != null && !metadata.getParent().getMetadata().isRoot()) {
             Set<Expression<?>> exprs = Sets.newHashSet();
             QueryMetadata md = getMetadata();
+            exprs.addAll(md.getProjection());
             exprs.addAll(md.getGroupBy());
             if (md.getWhere() != null) exprs.add(md.getWhere());
             if (md.getHaving() != null) exprs.add(md.getHaving());

diff --git a/querydsl-jpa/src/test/java/com/mysema/query/AbstractJPATest.java b/querydsl-jpa/src/test/java/com/mysema/query/AbstractJPATest.java
@@ -546,6 +546,26 @@ public void DistinctResults() {
         assertEquals(1, query().from(cat).distinct().list(cat.birthdate).size());
     }
 
+    @Test
+    public void Distinct_OrderBy() {
+        QCat cat = QCat.cat;
+        assertEquals(6, query()
+                .distinct()
+                .from(cat)
+                .orderBy(cat.mate.id.asc())
+                .list(cat.id, cat.mate.id).size());
+    }
+
+    @Test
+    public void Distinct_OrderBy2() {
+        QCat cat = QCat.cat;
+        assertEquals(4, query()
+                .distinct()
+                .from(cat)
+                .orderBy(cat.mate.id.asc())
+                .list(cat.id, cat.mate.id).size());
+    }
+
     @Test
     public void Date() {
         query().from(cat).list(cat.birthdate.year());