[DDC-2381] Wrong pagination query. Problems at large data.

Sergic · Apr 7, 2013 · 2733c81 · 2733c81 · TomasVotruba · Jun 13, 2014
1 parent b2e29ea
commit 2733c81
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php b/lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php
@@ -137,6 +137,11 @@ public function walkSelectStatement(SelectStatement $AST)
             ));
         }
 
+        // Build query with limit and offset before distincted query
+        $innerSql = $this->platform->modifyLimitQuery(
+            $innerSql, $this->maxResults, $this->firstResult
+        );
+
         // Build the counter query.
         $sql = sprintf('SELECT DISTINCT %s FROM (%s) dctrn_result',
             implode(', ', $sqlIdentifier), $innerSql);
@@ -147,9 +152,9 @@ public function walkSelectStatement(SelectStatement $AST)
         }
 
         // Apply the limit and offset.
-        $sql = $this->platform->modifyLimitQuery(
-            $sql, $this->maxResults, $this->firstResult
-        );
+        //$sql = $this->platform->modifyLimitQuery(
+        //    $sql, $this->maxResults, $this->firstResult
+        //);
 
         // Add the columns to the ResultSetMapping. It's not really nice but
         // it works. Preferably I'd clear the RSM or simply create a new one