summaryrefslogtreecommitdiff
path: root/includes/database
diff options
context:
space:
mode:
Diffstat (limited to 'includes/database')
-rw-r--r--includes/database/database.inc2
-rw-r--r--includes/database/mysql/database.inc5
-rw-r--r--includes/database/pgsql/database.inc5
3 files changed, 3 insertions, 9 deletions
diff --git a/includes/database/database.inc b/includes/database/database.inc
index 2bc67621f..f6f0659c7 100644
--- a/includes/database/database.inc
+++ b/includes/database/database.inc
@@ -683,7 +683,7 @@ abstract class DatabaseConnection extends PDO {
* A database query result resource, or NULL if the query was not executed
* correctly.
*/
- abstract public function queryRange($query, Array $args, $from, $count, Array $options);
+ abstract public function queryRange($query, Array $args, $from, $count, Array $options = array());
/**
* Runs a SELECT query and stores its results in a temporary table.
diff --git a/includes/database/mysql/database.inc b/includes/database/mysql/database.inc
index 24b28db00..60191db0a 100644
--- a/includes/database/mysql/database.inc
+++ b/includes/database/mysql/database.inc
@@ -39,10 +39,7 @@ class DatabaseConnection_mysql extends DatabaseConnection {
$this->exec('SET sql_mode=STRICT_ALL_TABLES');
}
- public function queryRange($query, Array $args, $from, $count, Array $options) {
- // Backward compatibility hack, temporary.
- $query = str_replace(array('%d' , '%f' , '%b' , "'%s'"), '?', $query);
-
+ public function queryRange($query, Array $args, $from, $count, Array $options = array()) {
return $this->query($query . ' LIMIT ' . $from . ', ' . $count, $args, $options);
}
diff --git a/includes/database/pgsql/database.inc b/includes/database/pgsql/database.inc
index 6a65c2cfb..6393eaebe 100644
--- a/includes/database/pgsql/database.inc
+++ b/includes/database/pgsql/database.inc
@@ -75,10 +75,7 @@ class DatabaseConnection_pgsql extends DatabaseConnection {
}
}
- public function queryRange($query, Array $args, $from, $count, Array $options) {
- // Backward compatibility hack, temporary.
- $query = str_replace(array('%d' , '%f' , '%b' , "'%s'"), '?', $query);
-
+ public function queryRange($query, Array $args, $from, $count, Array $options = array()) {
return $this->query($query . ' LIMIT ' . $count . ' OFFSET ' . $from, $args, $options);
}