--- /dev/fd/63	2007-03-12 18:33:42.000000000 -0700
+++ -	2007-03-12 18:33:42.000000000 -0700
@@ -191,12 +191,12 @@
 function db_query($query) {
   $args = func_get_args();
   array_shift($args);
+  _db_query_callback($args, TRUE);
+  $query = preg_replace_callback(DB_QUERY_REGEXP, '_db_query_callback', $query);
   $query = db_prefix_tables($query);
   if (isset($args[0]) and is_array($args[0])) { // 'All arguments in one array' syntax
     $args = $args[0];
   }
-  _db_query_callback($args, TRUE);
-  $query = preg_replace_callback(DB_QUERY_REGEXP, '_db_query_callback', $query);
   return _db_query($query);
 }