Fix Ticket #6 and #3

comfortablynumb · Aug 31, 2010 · ddc8a18 · ddc8a18
1 parent a1657f0
commit ddc8a18
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/lib/DoctrineExtensions/Paginate/CountWalker.php b/lib/DoctrineExtensions/Paginate/CountWalker.php
@@ -50,5 +50,8 @@ public function walkSelectStatement(SelectStatement $AST)
                 new AggregateExpression('count', $pathExpression, true), null
             )
         );
+
+        // ORDER BY is not needed, only increases query execution through unnecessary sorting.
+        $AST->orderByClause = null;
     }
 }
diff --git a/tests/DoctrineExtensions/Paginate/CountWalkerTest.php b/tests/DoctrineExtensions/Paginate/CountWalkerTest.php
@@ -19,6 +19,18 @@ public function testCountQuery()
         );
     }
 
+    public function testCountQuery_RemovesOrderBy()
+    {
+        $query = $this->entityManager->createQuery(
+            'SELECT p, c, a FROM DoctrineExtensions\Paginate\BlogPost p JOIN p.category c JOIN p.author a ORDER BY a.name');
+        $countQuery = Paginate::createCountQuery($query);
+
+        $this->assertEquals(
+            "SELECT count(DISTINCT b0_.id) AS sclr0 FROM BlogPost b0_ INNER JOIN Category c1_ ON b0_.category_id = c1_.id INNER JOIN Author a2_ ON b0_.author_id = a2_.id",
+            $countQuery->getSql()
+        );
+    }
+
     public function testCountQuery_RemovesLimits()
     {
         $query = $this->entityManager->createQuery(
@@ -75,6 +87,9 @@ class Author
 {
     /** @Id @column(type="integer") @generatedValue */
     public $id;
+
+    /** @Column(type="string") */
+    public $name;
 }
 
 /**