Merge pull request doctrine#1 from asgrim/ibmi

Change order of parameters in doModifyLimitQuery to work with Migrations
asgrim · Dec 12, 2015 · c750d2d · c750d2d
2 parents 6002abe + c3d9f00
commit c750d2d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/Doctrine/DBAL/Platforms/DB2Platform.php b/lib/Doctrine/DBAL/Platforms/DB2Platform.php
@@ -747,7 +747,7 @@ protected function doModifyLimitQuery($query, $limit, $offset = null)
         $offset = (int) (($offset)?:0);
 
         // Todo OVER() needs ORDER BY data!
-        $sql = 'SELECT db22.* FROM (SELECT ROW_NUMBER() OVER() AS DC_ROWNUM, db21.* '.
+        $sql = 'SELECT db22.* FROM (SELECT db21.*, ROW_NUMBER() OVER() AS DC_ROWNUM '.
                'FROM (' . $query . ') db21) db22 WHERE db22.DC_ROWNUM BETWEEN ' . ($offset+1) .' AND ' . ($offset+$limit);
 
         return $sql;

diff --git a/lib/Doctrine/DBAL/Platforms/DB2iSeriesPlatform.php b/lib/Doctrine/DBAL/Platforms/DB2iSeriesPlatform.php
@@ -304,7 +304,7 @@ protected function doModifyLimitQuery($query, $limit, $offset = null)
             $over  = 'ORDER BY ' . implode(', ', $overColumns);
         }
 
-        $sql = 'SELECT DOCTRINE_TBL.* FROM (SELECT ROW_NUMBER() OVER('.$over.') AS DOCTRINE_ROWNUM, DOCTRINE_TBL1.* '.
+        $sql = 'SELECT DOCTRINE_TBL.* FROM (SELECT DOCTRINE_TBL1.*, ROW_NUMBER() OVER(' . $over . ') AS DOCTRINE_ROWNUM '.
             'FROM (' . $query . ') DOCTRINE_TBL1) DOCTRINE_TBL WHERE DOCTRINE_TBL.DOCTRINE_ROWNUM BETWEEN ' . ($offset+1) .' AND ' . ($offset+$limit);
 
         return $sql;