Fix Oracle subquery ordering

See http://www.doctrine-project.org/jira/browse/DDC-1800 and http://www.doctrine-project.org/jira/browse/DDC-1958#comment-19969
doctrine · Apr 9, 2013 · 4bafcc5 · 4bafcc5
1 parent b8b7afe
commit 4bafcc5
Showing 1 changed file with 9 additions and 14 deletions.
diff --git a/lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php b/lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php
@@ -16,6 +16,7 @@
 use Doctrine\ORM\Query\SqlWalker;
 use Doctrine\ORM\Query\AST\SelectStatement;
 use Doctrine\DBAL\Platforms\PostgreSqlPlatform;
+use Doctrine\DBAL\Platforms\OraclePlatform;
 
 /**
  * Wraps the query in order to select root entity IDs for pagination.
@@ -138,19 +139,13 @@ public function walkSelectStatement(SelectStatement $AST)
         }
 
         // Build the counter query
-        if ($this->platform instanceof OraclePlatform) {
-            // Ordering is lost in Oracle with subqueries
-            // http://www.doctrine-project.org/jira/browse/DDC-1800
-            $sql = sprintf('SELECT DISTINCT %s, ROWNUM FROM (%s) dctrn_result ORDER BY ROWNUM ASC',
-                implode(', ', $sqlIdentifier), $innerSql);
-        } else {
-            $sql = sprintf('SELECT DISTINCT %s FROM (%s) dctrn_result',
-                implode(', ', $sqlIdentifier), $innerSql);
-        }
+        $sql = sprintf('SELECT DISTINCT %s FROM (%s) dctrn_result',
+            implode(', ', $sqlIdentifier), $innerSql);
 
-        if ($this->platform instanceof PostgreSqlPlatform) {
+        if ($this->platform instanceof PostgreSqlPlatform ||
+            $this->platform instanceof OraclePlatform) {
             //http://www.doctrine-project.org/jira/browse/DDC-1958
-            $this->getPostgresqlSql($AST, $sqlIdentifier, $innerSql, $sql);
+            $this->preserveSqlOrdering($AST, $sqlIdentifier, $innerSql, $sql);
         }
 
         // Apply the limit and offset.
@@ -168,9 +163,9 @@ public function walkSelectStatement(SelectStatement $AST)
 
         return $sql;
     }
-
+    
     /**
-     * Generates new SQL for postgresql if necessary.
+     * Generates new SQL for Postgresql or Oracle if necessary.
      *
      * @param SelectStatement $AST
      * @param array           $sqlIdentifier
@@ -179,7 +174,7 @@ public function walkSelectStatement(SelectStatement $AST)
      *
      * @return void
      */
-    public function getPostgresqlSql(SelectStatement $AST, array $sqlIdentifier, $innerSql, &$sql)
+    public function preserveSqlOrdering(SelectStatement $AST, array $sqlIdentifier, $innerSql, &$sql)
     {
         // For every order by, find out the SQL alias by inspecting the ResultSetMapping.
         $sqlOrderColumns = array();