? sites/default/files
? sites/default/settings.php
Index: includes/database.mysql-common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/database.mysql-common.inc,v
retrieving revision 1.18
diff -u -p -r1.18 database.mysql-common.inc
--- includes/database.mysql-common.inc	8 Feb 2008 03:24:05 -0000	1.18
+++ includes/database.mysql-common.inc	21 Feb 2008 04:56:32 -0000
@@ -7,6 +7,24 @@
  */
 
 /**
+ * Indicates the string to use to quote identifiers and names.
+ */
+define('DB_QUOTE_OPERATOR', '`');
+
+/**
+ * Replace all escape characters in a query, based on the database specific
+ * implementation.
+ *
+ * Queries sent to Drupal should wrap all identifiers and names in square
+ * brackets. This function will search for this syntax and replace it as
+ * corresponding escape characters, based on the database specific
+ * requirement.
+ */
+function db_escape_quote($sql) {
+  return preg_replace('/\[([A-Za-z0-9_]+)\]/', DB_QUOTE_OPERATOR .'\1'. DB_QUOTE_OPERATOR, $sql);
+}
+
+/**
  * Runs a basic query in the active database.
  *
  * User-supplied arguments to the query should be passed in as separate
@@ -34,6 +52,7 @@ function db_query($query) {
   $args = func_get_args();
   array_shift($args);
   $query = db_prefix_tables($query);
+  $query = db_escape_quote($query);
   if (isset($args[0]) and is_array($args[0])) { // 'All arguments in one array' syntax
     $args = $args[0];
   }
Index: includes/database.mysql.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/database.mysql.inc,v
retrieving revision 1.90
diff -u -p -r1.90 database.mysql.inc
--- includes/database.mysql.inc	17 Feb 2008 19:39:11 -0000	1.90
+++ includes/database.mysql.inc	21 Feb 2008 04:56:32 -0000
@@ -233,14 +233,11 @@ function db_query_range($query) {
   $from = array_pop($args);
   array_shift($args);
 
-  $query = db_prefix_tables($query);
+  $query .= ' LIMIT '. (int) $from .', '. (int) $count;
   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);
-  $query .= ' LIMIT '. (int)$from .', '. (int)$count;
-  return _db_query($query);
+  return db_query($query, $args);
 }
 
 /**
@@ -280,13 +277,11 @@ function db_query_temporary($query) {
   $tablename = array_pop($args);
   array_shift($args);
 
-  $query = preg_replace('/^SELECT/i', 'CREATE TEMPORARY TABLE '. $tablename .' Engine=HEAP SELECT', db_prefix_tables($query));
+  $query = preg_replace('/^SELECT/i', 'CREATE TEMPORARY TABLE '. $tablename .' Engine=HEAP SELECT', $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);
+  return db_query($query, $args);
 }
 
 /**
Index: includes/database.mysqli.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/database.mysqli.inc,v
retrieving revision 1.55
diff -u -p -r1.55 database.mysqli.inc
--- includes/database.mysqli.inc	17 Feb 2008 19:39:11 -0000	1.55
+++ includes/database.mysqli.inc	21 Feb 2008 04:56:32 -0000
@@ -236,14 +236,11 @@ function db_query_range($query) {
   $from = array_pop($args);
   array_shift($args);
 
-  $query = db_prefix_tables($query);
+  $query .= ' LIMIT '. (int) $from .', '. (int) $count;
   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);
-  $query .= ' LIMIT '. (int)$from .', '. (int)$count;
-  return _db_query($query);
+  return db_query($query, $args);
 }
 
 /**
@@ -283,13 +280,11 @@ function db_query_temporary($query) {
   $tablename = array_pop($args);
   array_shift($args);
 
-  $query = preg_replace('/^SELECT/i', 'CREATE TEMPORARY TABLE '. $tablename .' Engine=HEAP SELECT', db_prefix_tables($query));
+  $query = preg_replace('/^SELECT/i', 'CREATE TEMPORARY TABLE '. $tablename .' Engine=HEAP SELECT', $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);
+  return db_query($query, $args);
 }
 
 /**
Index: includes/database.pgsql.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/database.pgsql.inc,v
retrieving revision 1.69
diff -u -p -r1.69 database.pgsql.inc
--- includes/database.pgsql.inc	8 Feb 2008 03:24:05 -0000	1.69
+++ includes/database.pgsql.inc	21 Feb 2008 04:56:33 -0000
@@ -12,6 +12,24 @@
  */
 
 /**
+ * Indicates the string to use to quote identifiers and names.
+ */
+define('DB_QUOTE_OPERATOR', '"');
+
+/**
+ * Replace all escape characters in a query, based on the database specific
+ * implementation.
+ *
+ * Queries sent to Drupal should wrap all identifiers and names in square
+ * brackets. This function will search for this syntax and replace it as
+ * corresponding escape characters, based on the database specific
+ * requirement.
+ */
+function db_escape_quote($sql) {
+  return preg_replace('/\[([A-Za-z0-9_]+)\]/', DB_QUOTE_OPERATOR .'\1'. DB_QUOTE_OPERATOR, $sql);
+}
+
+/**
  * Report database status.
  */
 function db_status_report() {
@@ -116,6 +134,7 @@ function db_query($query) {
   $args = func_get_args();
   array_shift($args);
   $query = db_prefix_tables($query);
+  $query = db_escape_quote($query);
   if (isset($args[0]) and is_array($args[0])) { // 'All arguments in one array' syntax
     $args = $args[0];
   }
@@ -274,14 +293,11 @@ function db_query_range($query) {
   $from = array_pop($args);
   array_shift($args);
 
-  $query = db_prefix_tables($query);
+  $query .= ' LIMIT '. (int) $count .' OFFSET '. (int) $from;
   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);
-  $query .= ' LIMIT '. (int)$count .' OFFSET '. (int)$from;
-  return _db_query($query);
+  return db_query($query, $args);
 }
 
 /**
@@ -321,13 +337,11 @@ function db_query_temporary($query) {
   $tablename = array_pop($args);
   array_shift($args);
 
-  $query = preg_replace('/^SELECT/i', 'CREATE TEMPORARY TABLE '. $tablename .' AS SELECT', db_prefix_tables($query));
+  $query = preg_replace('/^SELECT/i', 'CREATE TEMPORARY TABLE '. $tablename .' AS SELECT', $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);
+  return db_query($query, $args);
 }
 
 /**
Index: includes/session.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/session.inc,v
retrieving revision 1.46
diff -u -p -r1.46 session.inc
--- includes/session.inc	17 Feb 2008 20:03:42 -0000	1.46
+++ includes/session.inc	21 Feb 2008 04:56:33 -0000
@@ -29,7 +29,7 @@ function sess_read($key) {
   }
 
   // Otherwise, if the session is still active, we have a record of the client's session in the database.
-  $user = db_fetch_object(db_query("SELECT u.*, s.* FROM {users} u INNER JOIN {sessions} s ON u.uid = s.uid WHERE s.sid = '%s'", $key));
+  $user = db_fetch_object(db_query("SELECT u.*, s.* FROM [{users}] u INNER JOIN [{sessions}] s ON u.[uid] = s.[uid] WHERE s.[sid] = '%s'", $key));
 
   // We found the client's session record and they are an authenticated user
   if ($user && $user->uid > 0) {
@@ -39,7 +39,7 @@ function sess_read($key) {
     // Add roles element to $user
     $user->roles = array();
     $user->roles[DRUPAL_AUTHENTICATED_RID] = 'authenticated user';
-    $result = db_query("SELECT r.rid, r.name FROM {role} r INNER JOIN {users_roles} ur ON ur.rid = r.rid WHERE ur.uid = %d", $user->uid);
+    $result = db_query("SELECT r.[rid], r.[name] FROM [{role}] r INNER JOIN [{users_roles}] ur ON ur.[rid] = r.[rid] WHERE ur.[uid] = %d", $user->uid);
     while ($role = db_fetch_object($result)) {
       $user->roles[$role->rid] = $role->name;
     }
@@ -62,7 +62,7 @@ function sess_write($key, $value) {
     return TRUE;
   }
 
-  $result = db_result(db_query("SELECT COUNT(*) FROM {sessions} WHERE sid = '%s'", $key));
+  $result = db_result(db_query("SELECT COUNT(*) FROM [{sessions}] WHERE [sid] = '%s'", $key));
 
   if (!$result) {
     // Only save session data when when the browser sends a cookie. This keeps
@@ -70,16 +70,16 @@ function sess_write($key, $value) {
     // and gives more useful statistics. We can't eliminate anonymous session
     // table rows without breaking throttle module and "Who's Online" block.
     if ($user->uid || $value || count($_COOKIE)) {
-      db_query("INSERT INTO {sessions} (sid, uid, cache, hostname, session, timestamp) VALUES ('%s', %d, %d, '%s', '%s', %d)", $key, $user->uid, isset($user->cache) ? $user->cache : '', ip_address(), $value, time());
+      db_query("INSERT INTO [{sessions}] ([sid], [uid], [cache], [hostname], [session], [timestamp]) VALUES ('%s', %d, %d, '%s', '%s', %d)", $key, $user->uid, isset($user->cache) ? $user->cache : '', ip_address(), $value, time());
     }
   }
   else {
-    db_query("UPDATE {sessions} SET uid = %d, cache = %d, hostname = '%s', session = '%s', timestamp = %d WHERE sid = '%s'", $user->uid, isset($user->cache) ? $user->cache : '', ip_address(), $value, time(), $key);
+    db_query("UPDATE [{sessions}] SET [uid] = %d, [cache] = %d, [hostname] = '%s', [session] = '%s', [timestamp] = %d WHERE [sid] = '%s'", $user->uid, isset($user->cache) ? $user->cache : '', ip_address(), $value, time(), $key);
 
     // Last access time is updated no more frequently than once every 180 seconds.
     // This reduces contention in the users table.
     if ($user->uid && time() - $user->access > variable_get('session_write_interval', 180)) {
-      db_query("UPDATE {users} SET access = %d WHERE uid = %d", time(), $user->uid);
+      db_query("UPDATE [{users}] SET [access] = %d WHERE [uid] = %d", time(), $user->uid);
     }
   }
 
@@ -92,7 +92,7 @@ function sess_write($key, $value) {
 function sess_regenerate() {
   $old_session_id = session_id();
   session_regenerate_id();
-  db_query("UPDATE {sessions} SET sid = '%s' WHERE sid = '%s'", session_id(), $old_session_id);
+  db_query("UPDATE [{sessions}] SET [sid] = '%s' WHERE [sid] = '%s'", session_id(), $old_session_id);
 }
 
 /**
@@ -109,8 +109,8 @@ function sess_regenerate() {
  *   The number of users with sessions.
  */
 function sess_count($timestamp = 0, $anonymous = true) {
-  $query = $anonymous ? ' AND uid = 0' : ' AND uid > 0';
-  return db_result(db_query('SELECT COUNT(sid) AS count FROM {sessions} WHERE timestamp >= %d'. $query, $timestamp));
+  $query = $anonymous ? ' AND [uid] = 0' : ' AND [uid] > 0';
+  return db_result(db_query('SELECT COUNT([sid]) AS [count] FROM [{sessions}] WHERE [timestamp] >= %d'. $query, $timestamp));
 }
 
 /**
@@ -120,7 +120,7 @@ function sess_count($timestamp = 0, $ano
  *   the session id
  */
 function sess_destroy_sid($sid) {
-  db_query("DELETE FROM {sessions} WHERE sid = '%s'", $sid);
+  db_query("DELETE FROM [{sessions}] WHERE [sid] = '%s'", $sid);
 }
 
 /**
@@ -130,7 +130,7 @@ function sess_destroy_sid($sid) {
  *   the user id
  */
 function sess_destroy_uid($uid) {
-  db_query('DELETE FROM {sessions} WHERE uid = %d', $uid);
+  db_query('DELETE FROM [{sessions}] WHERE [uid] = %d', $uid);
 }
 
 function sess_gc($lifetime) {
@@ -139,7 +139,7 @@ function sess_gc($lifetime) {
   // for three weeks before deleting them, you need to set gc_maxlifetime
   // to '1814400'. At that value, only after a user doesn't log in after
   // three weeks (1814400 seconds) will his/her session be removed.
-  db_query("DELETE FROM {sessions} WHERE timestamp < %d", time() - $lifetime);
+  db_query("DELETE FROM [{sessions}] WHERE [timestamp] < %d", time() - $lifetime);
 
   return TRUE;
 }
Index: includes/tablesort.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/tablesort.inc,v
retrieving revision 1.47
diff -u -p -r1.47 tablesort.inc
--- includes/tablesort.inc	4 Jan 2008 09:31:48 -0000	1.47
+++ includes/tablesort.inc	21 Feb 2008 04:56:33 -0000
@@ -40,7 +40,7 @@ function tablesort_sql($header, $before 
   $ts = tablesort_init($header);
   if ($ts['sql']) {
     // Based on code from db_escape_table(), but this can also contain a dot.
-    $field = preg_replace('/[^A-Za-z0-9_.]+/', '', $ts['sql']);
+    $field = preg_replace('/[^A-Za-z0-9_.\[\]]+/', '', $ts['sql']);
 
     // Sort order can only be ASC or DESC.
     $sort = drupal_strtoupper($ts['sort']);
Index: modules/user/user.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.admin.inc,v
retrieving revision 1.19
diff -u -p -r1.19 user.admin.inc
--- modules/user/user.admin.inc	20 Feb 2008 13:46:43 -0000	1.19
+++ modules/user/user.admin.inc	21 Feb 2008 04:56:33 -0000
@@ -131,17 +131,17 @@ function user_admin_account() {
 
   $header = array(
     array(),
-    array('data' => t('Username'), 'field' => 'u.name'),
-    array('data' => t('Status'), 'field' => 'u.status'),
+    array('data' => t('Username'), 'field' => 'u.[name]'),
+    array('data' => t('Status'), 'field' => 'u.[status]'),
     t('Roles'),
-    array('data' => t('Member for'), 'field' => 'u.created', 'sort' => 'desc'),
-    array('data' => t('Last access'), 'field' => 'u.access'),
+    array('data' => t('Member for'), 'field' => 'u.[created]', 'sort' => 'desc'),
+    array('data' => t('Last access'), 'field' => 'u.[access]'),
     t('Operations')
   );
 
-  $sql = 'SELECT DISTINCT u.uid, u.name, u.status, u.created, u.access FROM {users} u LEFT JOIN {users_roles} ur ON u.uid = ur.uid '. $filter['join'] .' WHERE u.uid != 0 '. $filter['where'];
+  $sql = 'SELECT DISTINCT u.[uid], u.[name], u.[status], u.[created], u.[access] FROM [{users}] u LEFT JOIN [{users_roles}] ur ON u.[uid] = ur.[uid] '. $filter['join'] .' WHERE u.[uid] != 0 '. $filter['where'];
   $sql .= tablesort_sql($header);
-  $query_count = 'SELECT COUNT(DISTINCT u.uid) FROM {users} u LEFT JOIN {users_roles} ur ON u.uid = ur.uid '. $filter['join'] .' WHERE u.uid != 0 '. $filter['where'];
+  $query_count = 'SELECT COUNT(DISTINCT u.[uid]) FROM [{users}] u LEFT JOIN [{users_roles}] ur ON u.[uid] = ur.[uid] '. $filter['join'] .' WHERE u.[uid] != 0 '. $filter['where'];
   $result = pager_query($sql, 50, 0, $query_count, $filter['args']);
 
   $form['options'] = array(
@@ -174,7 +174,7 @@ function user_admin_account() {
     $form['name'][$account->uid] = array('#value' => theme('username', $account));
     $form['status'][$account->uid] =  array('#value' => $status[$account->status]);
     $users_roles = array();
-    $roles_result = db_query('SELECT rid FROM {users_roles} WHERE uid = %d', $account->uid);
+    $roles_result = db_query('SELECT [rid] FROM [{users_roles}] WHERE [uid] = %d', $account->uid);
     while ($user_role = db_fetch_object($roles_result)) {
       $users_roles[] = $roles[$user_role->rid];
     }