1 files changed, 2 insertions, 11 deletions
diff --git a/includes/database/mysql/database.inc b/includes/database/mysql/database.inc
index 27623a273..3f143cfe2 100644
--- a/includes/database/mysql/database.inc
+++ b/includes/database/mysql/database.inc
@@ -46,11 +46,11 @@ class DatabaseConnection_mysql extends DatabaseConnection {
     $this->exec("SET sql_mode='ANSI,TRADITIONAL'");
   }
 
-  public function queryRange($query, array $args, $from, $count, array $options = array()) {
+  public function queryRange($query, $from, $count, array $args = array(), array $options = array()) {
     return $this->query($query . ' LIMIT ' . $from . ', ' . $count, $args, $options);
   }
 
-  public function queryTemporary($query, array $args, array $options = array()) {
+  public function queryTemporary($query, array $args = array(), array $options = array()) {
     $tablename = $this->generateTemporaryTableName();
     $this->query(preg_replace('/^SELECT/i', 'CREATE TEMPORARY TABLE {' . $tablename . '} Engine=MEMORY SELECT', $query), $args, $options);
     return $tablename;
@@ -68,15 +68,6 @@ class DatabaseConnection_mysql extends DatabaseConnection {
     // We don't want to override any of the defaults.
     return NULL;
   }
-
-  /**
-   * @todo Remove this as soon as db_rewrite_sql() has been exterminated.
-   */
-  public function distinctField($table, $field, $query) {
-    $field_to_select = 'DISTINCT(' . $table . '.' . $field . ')';
-    // (?<!text) is a negative look-behind (no need to rewrite queries that already use DISTINCT).
-    return preg_replace('/(SELECT.*)(?:' . $table . '\.|\s)(?<!DISTINCT\()(?<!DISTINCT\(' . $table . '\.)' . $field . '(.*FROM )/AUsi', '\1 ' . $field_to_select . '\2', $query);
-  }
 }