Fix limiting queries.

horde · Jan 22, 2014 · 653039d · 653039d
1 parent fd67d63
commit 653039d
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/framework/Db/lib/Horde/Db/Adapter/Oci8.php b/framework/Db/lib/Horde/Db/Adapter/Oci8.php
@@ -376,7 +376,12 @@ public function addLimitOffset($sql, $options)
         if (isset($options['limit'])) {
             $offset = isset($options['offset']) ? $options['offset'] : 0;
             $limit = $options['limit'] + $offset;
-            $sql = "SELECT * FROM ($sql) WHERE ROWNUM <= $limit AND ROWNUM > $offset";
+            if ($limit) {
+                $sql = "SELECT a.*, ROWNUM rnum FROM ($sql) a WHERE ROWNUM <= $limit";
+                if ($offset) {
+                    $sql = "SELECT * FROM ($sql) WHERE rnum > $offset";
+                }
+            }
         }
         return $sql;
     }