Index: includes/database/database.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/database/database.inc,v
retrieving revision 1.72
diff -u -r1.72 database.inc
--- includes/database/database.inc	21 Aug 2009 16:36:35 -0000	1.72
+++ includes/database/database.inc	21 Aug 2009 16:53:38 -0000
@@ -1817,7 +1817,6 @@
     $args = func_get_args();
     array_shift($args);
   }
-  list($query, $args, $options) = _db_query_process_args($query, $args, $options);
 
   return Database::getConnection($options['target'])->query($query, $args, $options);
 }
@@ -1851,7 +1850,6 @@
     $count = array_pop($args);
     $from = array_pop($args);
   }
-  list($query, $args, $options) = _db_query_process_args($query, $args, $options);
 
   return Database::getConnection($options['target'])->queryRange($query, $args, $from, $count, $options);
 }
@@ -1879,7 +1877,6 @@
     $args = func_get_args();
     array_shift($args);
   }
-  list($query, $args, $options) = _db_query_process_args($query, $args, $options);
 
   return Database::getConnection($options['target'])->queryTemporary($query, $args, $options);
 }
@@ -2505,33 +2502,6 @@
 }
 
 /**
- * Backward-compatibility utility.
- *
- * This function should be removed after all queries have been converted
- * to the new API. It is temporary only.
- *
- * @todo Remove this once the query conversion is complete.
- */
-function _db_query_process_args($query, $args, $options) {
-
-  if (!is_array($options)) {
-    $options = array();
-  }
-  if (empty($options['target'])) {
-    $options['target'] = 'default';
-  }
-
-  // Temporary backward-compatibility hacks. Remove later.
-  $old_query = $query;
-  $query = str_replace(array('%n', '%d', '%f', '%b', "'%s'", '%s'), '?', $old_query);
-  if ($old_query !== $query) {
-    $args = array_values($args);  // The old system allowed named arrays, but PDO doesn't if you use ?.
-  }
-
-  return array($query, $args, $options);
-}
-
-/**
  * Helper function for db_rewrite_sql.
  *
  * Collects JOIN and WHERE statements via hook_db_rewrite_sql()