Changeset 4362

Timestamp:

05/13/08 09:26:46 (8 months ago)

Author:

romanb

Message:

Adjustments to Oracle limit/offset emulation to make it look exactly like in Zend_Db.

Files:

• branches/0.11/lib/Doctrine/Connection/Oracle.php (modified) (2 diffs)

branches/0.11/lib/Doctrine/Connection/Oracle.php

@@ -70 +70 @@
     public function setDateFormat($format = 'YYYY-MM-DD HH24:MI:SS')
     {
-      $this->exec('ALTER SESSION SET NLS_DATE_FORMAT = "' . $format . '"');
+        $this->exec('ALTER SESSION SET NLS_DATE_FORMAT = "' . $format . '"');
     }
 
@@ -94 +94 @@
                 if ($offset > 0) {
                     $min = $offset + 1;
-                    $query = 'SELECT * FROM (SELECT a.*, ROWNUM dctrn_rownum FROM (' . $query
-                           . ') a WHERE ROWNUM <= ' . $max . ') WHERE dctrn_rownum >= ' . $min;
+                    $query = 'SELECT b.* FROM (
+                                 SELECT a.*, ROWNUM AS doctrine_rownum FROM ('
+                                  . $query . ') a
+                              ) b
+                              WHERE b.doctrine_rownum BETWEEN ' . $min .  ' AND ' . $max;
                 } else {
                     $query = 'SELECT a.* FROM (' . $query .') a WHERE ROWNUM <= ' . $max;