- Patch #653926 by Damien Tournoud: fixed range of sub-queries not being honored.

1 files changed, 4 insertions, 5 deletions

diff --git a/includes/database/select.inc b/includes/database/select.inc
index 84a01f294..3b9643b1e 100644
--- a/includes/database/select.inc
+++ b/includes/database/select.inc
@@ -1085,10 +1085,6 @@ class SelectQuery extends Query implements SelectQueryInterface {
     }
 
     $args = $this->getArguments();
-
-    if (!empty($this->range)) {
-      return $this->connection->queryRange((string)$this, $this->range['start'], $this->range['length'], $args, $this->queryOptions);
-    }
     return $this->connection->query((string)$this, $args, $this->queryOptions);
   }
 
@@ -1358,7 +1354,10 @@ class SelectQuery extends Query implements SelectQueryInterface {
       $query .= implode(', ', $fields);
     }
 
-    // RANGE is database specific, so we can't do it here.
+    // RANGE
+    if (!empty($this->range)) {
+      $query .= "\nLIMIT " . $this->range['length'] . " OFFSET " . $this->range['start'];
+    }
 
     // UNION is a little odd, as the select queries to combine are passed into
     // this query, but syntactically they all end up on the same level.