Index: drupal_test_case.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/drupal_test_case.php,v
retrieving revision 1.53
diff -u -p -r1.53 drupal_test_case.php
--- drupal_test_case.php	19 Feb 2008 13:52:05 -0000	1.53
+++ drupal_test_case.php	3 Apr 2008 08:53:52 -0000
@@ -66,7 +66,7 @@ class DrupalTestCase extends WebTestCase
     node_save($node);
     
     // small hack to link revisions to our test user
-    db_query('UPDATE {node_revisions} SET uid = %d WHERE vid = %d', $node->uid, $node->vid);
+    db_query('UPDATE [{node_revisions}] SET [uid] = %d WHERE [vid] = %d', $node->uid, $node->vid);
     $this->_cleanupNodes[] = $node->nid;
     return $node;
   }
@@ -362,12 +362,12 @@ class DrupalTestCase extends WebTestCase
     }
     /* Create role */
     $role_name = $this->randomName();
-    db_query("INSERT INTO {role} (name) VALUES ('%s')", $role_name);
-    $role = db_fetch_object(db_query("SELECT * FROM {role} WHERE name = '%s'", $role_name));
+    db_query("INSERT INTO [{role}] ([name]) VALUES (%s)", $role_name);
+    $role = db_fetch_object(db_query("SELECT * FROM [{role}] WHERE [name] = %s", $role_name));
     $this->assertTrue($role, " [role] created name: $role_name, id: " . (isset($role->rid) ? $role->rid : '-n/a-'));
     if ($role && !empty($role->rid)) {
       /* Create permissions */
-      db_query("INSERT INTO {permission} (rid, perm) VALUES (%d, '%s')", $role->rid, $permstring);
+      db_query("INSERT INTO [{permission}] ([rid], [perm]) VALUES (%d, %s)", $role->rid, $permstring);
       $this->assertTrue(db_affected_rows(), ' [role] created permissions: ' . $permstring);
       $this->_cleanupRoles[] = $role->rid;
       return $role->rid;
@@ -473,15 +473,15 @@ class DrupalTestCase extends WebTestCase
     //delete roles
     while (sizeof($this->_cleanupRoles) > 0) {
       $rid = array_pop($this->_cleanupRoles);
-      db_query("DELETE FROM {role} WHERE rid = %d",       $rid);
-      db_query("DELETE FROM {permission} WHERE rid = %d", $rid);
+      db_query("DELETE FROM [{role}] WHERE [rid] = %d",       $rid);
+      db_query("DELETE FROM [{permission}] WHERE [rid] = %d", $rid);
     }
 
     //delete users and their content
     while (sizeof($this->_cleanupUsers) > 0) {
       $uid = array_pop($this->_cleanupUsers);
       // cleanup nodes this user created
-      $result = db_query("SELECT nid FROM {node} WHERE uid = %d", $uid);
+      $result = db_query("SELECT [nid] FROM [{node}] WHERE [uid] = %d", $uid);
       while ($node = db_fetch_array($result)) {
         node_delete($node['nid']);
       }
Index: drupal_unit_tests.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/drupal_unit_tests.php,v
retrieving revision 1.13
diff -u -p -r1.13 drupal_unit_tests.php
--- drupal_unit_tests.php	21 Jan 2008 07:04:22 -0000	1.13
+++ drupal_unit_tests.php	3 Apr 2008 08:53:52 -0000
@@ -112,7 +112,7 @@ class DrupalUnitTests extends DrupalTest
 
     // Restores modules
     foreach ($this->_cleanupModules as $name => $status) {
-      db_query("UPDATE {system} SET status = %d WHERE name = '%s' AND type = 'module'", $status, $name);
+      db_query("UPDATE [{system}] SET [status] = %d WHERE [name] = %s AND [type] = 'module'", $status, $name);
     }
     $this->_cleanupModules = array();
 
@@ -158,7 +158,7 @@ class DrupalUnitTests extends DrupalTest
       return TRUE;
     }
     /* Update table */
-    db_query("UPDATE {system} SET status = 0 WHERE name = '%s' AND type = 'module'", $name);
+    db_query("UPDATE [{system}] SET [status] = 0 WHERE [name] = %s AND [type] = 'module'", $name);
     if (db_affected_rows()) {
       /* Make sure not overwriting when double switching */
       if (!isset($this->_cleanupModules[$name])) {
Index: tests/content_actions.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/tests/Attic/content_actions.test,v
retrieving revision 1.4
diff -u -p -r1.4 content_actions.test
--- tests/content_actions.test	28 Jan 2008 08:48:37 -0000	1.4
+++ tests/content_actions.test	3 Apr 2008 08:53:52 -0000
@@ -27,7 +27,7 @@ class ActionsContentTest extends  Drupal
 
     $hash = md5('node_publish_action');
 
-    $not_clean = db_result(db_query("SELECT COUNT(*) FROM {trigger_assignments} WHERE aid IN ('". implode("','", $content_actions) ."')"));
+    $not_clean = db_result(db_query("SELECT COUNT(*) FROM [{trigger_assignments}] WHERE [aid] IN ('". implode("','", $content_actions) ."')"));
     $this->assertFalse($not_clean, t('Actions were already assigned to the trigger. Unassign all content triggers before attempting to run again.'));
 
     if ($not_clean) {
@@ -63,7 +63,7 @@ class ActionsContentTest extends  Drupal
     $this->drupalPost('admin/build/trigger/unassign/nodeapi/presave/'. $hash, array(), 'Unassign');
     $this->assertWantedRaw(t('Action %action has been unassigned.', array('%action' => 'Publish post')), t('Check to make sure action can be unassigned from trigger.'));
 
-    $assigned = db_result(db_query("SELECT COUNT(*) FROM {trigger_assignments} WHERE aid IN ('". implode("','", $content_actions) ."')"));
+    $assigned = db_result(db_query("SELECT COUNT(*) FROM [{trigger_assignments}] WHERE [aid] IN ('". implode("','", $content_actions) ."')"));
     $this->assertFalse($assigned, t('Check to make sure unassign worked properly at the database level.'));
   }
 }
Index: tests/forum_module.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/tests/Attic/forum_module.test,v
retrieving revision 1.3
diff -u -p -r1.3 forum_module.test
--- tests/forum_module.test	28 Jan 2008 08:48:37 -0000	1.3
+++ tests/forum_module.test	3 Apr 2008 08:53:52 -0000
@@ -35,7 +35,7 @@ class DrupalForumTestCase extends Drupal
     $this->assertWantedRaw(t('Created new @type %term.', array('%term' => $title, '@type' => $type)), t('New forum container has been created'));
 
     // Grab the newly created container
-    $term = db_fetch_array(db_query("SELECT * FROM {term_data} t WHERE t.vid = %d AND t.name = '%s' AND t.description = '%s'", variable_get('forum_nav_vocabulary', ''), $title, $description));
+    $term = db_fetch_array(db_query("SELECT * FROM [{term_data}] t WHERE t.[vid] = %d AND t.[name] = %s AND t.[description] = %s", variable_get('forum_nav_vocabulary', ''), $title, $description));
 
     // Make sure we actually found a container
     $this->assertTrue(!empty($term), 'The container actually exists in the database');
@@ -61,7 +61,7 @@ class DrupalForumTestCase extends Drupal
     $this->assertWantedRaw(t('Created new @type %term.', array('%term' => $title, '@type' => $type)), t('New forum has been created'));
 
     // Grab the newly created forum
-    $term = db_fetch_array(db_query("SELECT * FROM {term_data} t WHERE t.vid = %d AND t.name = '%s' AND t.description = '%s'", variable_get('forum_nav_vocabulary', ''), $title, $description));
+    $term = db_fetch_array(db_query("SELECT * FROM [{term_data}] t WHERE t.[vid] = %d AND t.[name] = %s AND t.[description] = %s", variable_get('forum_nav_vocabulary', ''), $title, $description));
 
     // Make sure we actually found a forum
     $this->assertTrue(!empty($term), 'The forum actually exists in the database');
@@ -146,7 +146,7 @@ class EditForumTaxonomyTest extends Drup
     $this->assertWantedRaw(t('Updated vocabulary %name.', array('%name' => $title)), t('Vocabulary has been edited'));
 
     // Grab the newly edited vocabulary
-    $cur_settings = db_fetch_array(db_query('SELECT v.* FROM {vocabulary} v WHERE v.vid = %d', $vid));
+    $cur_settings = db_fetch_array(db_query('SELECT v.* FROM [{vocabulary}] v WHERE v.[vid] = %d', $vid));
 
     // Make sure we actually edited the vocabulary properly
     $this->assertTrue($cur_settings['name'] == $title, 'The name has been updated properly');
Index: tests/image_module.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/tests/Attic/image_module.test,v
retrieving revision 1.14
diff -u -p -r1.14 image_module.test
--- tests/image_module.test	28 Jan 2008 08:48:37 -0000	1.14
+++ tests/image_module.test	3 Apr 2008 08:53:52 -0000
@@ -22,11 +22,11 @@ class ImageModuleTest extends DrupalTest
   function _rolesApi($op, $edit) {
     if ($op == 'delete') {
       $id = $edit['rid'];
-      db_query('DELETE FROM {role} WHERE rid = %d', $id);
-      db_query('DELETE FROM {permission} WHERE rid = %d', $id);
+      db_query('DELETE FROM [{role}] WHERE [rid] = %d', $id);
+      db_query('DELETE FROM [{permission}] WHERE [rid] = %d', $id);
 
       // Update the users who have this role set:
-      $result = db_query('SELECT DISTINCT(ur1.uid) FROM {users_roles} ur1 LEFT JOIN {users_roles} ur2 ON ur2.uid = ur1.uid WHERE ur1.rid = %d AND ur2.rid != ur1.rid', $id);
+      $result = db_query('SELECT DISTINCT(ur1.[uid]) FROM [{users_roles}] ur1 LEFT JOIN [{users_roles}] ur2 ON ur2.[uid] = ur1.[uid] WHERE ur1.[rid] = %d AND ur2.[rid] != ur1.[rid]', $id);
       $uid = array();
 
       while ($u = db_fetch_object($result)) {
@@ -34,19 +34,19 @@ class ImageModuleTest extends DrupalTest
       }
 
       if ($uid) {
-        db_query('DELETE FROM {users_roles} WHERE rid = %d AND uid IN (%s)', $id, implode(', ', $uid));
+        db_query('DELETE FROM [{users_roles}] WHERE [rid] = %d AND [uid] IN (%s)', $id, implode(', ', $uid));
       }
 
       // Users with only the deleted role are put back in the authenticated users pool.
-      db_query('UPDATE {users_roles} SET rid = %d WHERE rid = %d', _user_authenticated_id(), $id);
+      db_query('UPDATE [{users_roles}] SET [rid] = %d WHERE [rid] = %d', _user_authenticated_id(), $id);
 
     }
     else if ($op == 'add') {
       if (isset($edit['name'])) {
-        db_query("INSERT INTO {role} (name) VALUES ('%s')", $edit['name']);
-        $result = db_query("SELECT rid FROM {role} WHERE name = '%s'", $edit['name']);
+        db_query("INSERT INTO [{role}] ([name]) VALUES (%s)", $edit['name']);
+        $result = db_query("SELECT [rid] FROM [{role}] WHERE [name] = %s", $edit['name']);
         $rid = db_result($result);
-        db_query("INSERT INTO {permission} (rid, perm) VALUES (%d, '%s')", $rid, $edit['perm']);
+        db_query("INSERT INTO [{permission}] ([rid], [perm]) VALUES (%d, %s)", $rid, $edit['perm']);
         return $rid;
       }
       else {
Index: tests/menu_module.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/tests/Attic/menu_module.test,v
retrieving revision 1.6
diff -u -p -r1.6 menu_module.test
--- tests/menu_module.test	28 Jan 2008 08:48:37 -0000	1.6
+++ tests/menu_module.test	3 Apr 2008 08:53:52 -0000
@@ -75,7 +75,7 @@ class MenuModuleTestCase extends  Drupal
     $this->drupalPost("admin/build/menu-customize/". $menu_name ."/add", $edit, "Save");
     $out = $this->drupalGet("admin/build/menu-customize/$menu_name");
     $this->assertText($title, 'Link created');
-    $mlid = db_result(db_query("SELECT mlid FROM {menu_links} WHERE link_title = '%s'", $title));
+    $mlid = db_result(db_query("SELECT [mlid] FROM [{menu_links}] WHERE [link_title] = %s", $title));
 
     return $mlid;
   }
@@ -217,21 +217,21 @@ class MenuModuleReset extends DrupalTest
     $this->assertTrue($found, 'System module item found');
     if ($found) {
       // We can't use menu API here because of localization issues.
-      $item = db_fetch_array(db_query('SELECT * FROM {menu_links} WHERE mlid = %d', $mlid));
+      $item = db_fetch_array(db_query('SELECT * FROM [{menu_links}] WHERE [mlid] = %d', $mlid));
       $edit['menu[link_title]'] = $this->randomName(16);
       $path = 'admin/build/menu/item/'. $mlid;
       $this->drupalPost($path .'/edit', $edit, 'Save');
-      $new_title = db_result(db_query('SELECT link_title FROM {menu_links} WHERE mlid = %d', $mlid));
+      $new_title = db_result(db_query('SELECT [link_title] FROM [{menu_links}] WHERE [mlid] = %d', $mlid));
       $this->assertTrue($new_title == $edit['menu[link_title]'], 'Edit succesful');
       $this->assertFalse($item['link_title'] == $new_title, 'Item changed' );
       $reset_path = $path .'/reset';
       $this->assertWantedRaw($reset_path, 'Reset link found');
       $this->drupalPost($reset_path, array(), 'Reset');
-      $reset_title = db_result(db_query('SELECT link_title FROM {menu_links} WHERE mlid = %d', $mlid));
+      $reset_title = db_result(db_query('SELECT [link_title] FROM [{menu_links}] WHERE [mlid] = %d', $mlid));
       $this->assertFalse($edit['menu[link_title]'] == $reset_title, 'Item reset');
       $this->assertText(t('The menu item was reset to its default settings.'), 'Reset message');
       drupal_write_record('menu_links', $item, 'mlid');
-      $restored_item = db_fetch_array(db_query('SELECT * FROM {menu_links} WHERE mlid = %d', $mlid));
+      $restored_item = db_fetch_array(db_query('SELECT * FROM [{menu_links}] WHERE [mlid] = %d', $mlid));
       $this->assertTrue($item == $restored_item, 'Item restored');
     }
   }
Index: tests/node_revisions.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/tests/Attic/node_revisions.test,v
retrieving revision 1.4
diff -u -p -r1.4 node_revisions.test
--- tests/node_revisions.test	28 Jan 2008 08:48:37 -0000	1.4
+++ tests/node_revisions.test	3 Apr 2008 08:53:52 -0000
@@ -95,7 +95,7 @@ class NodeRevisionsTest extends DrupalTe
     $test_user = $this->drupalCreateUserRolePerm(array('delete revisions', 'delete any page content'));
     $this->drupalLoginUser($test_user);
     $this->drupalPost("node/$node->nid/revisions/$vid/delete", array(), 'Delete');
-    $this->assertTrue(db_result(db_query('SELECT COUNT(vid) FROM {node_revisions} WHERE nid = %d and VID = %d', $node->nid, $vid)) == 0, 'Check to make sure revisions delete properly');    $this->cleanup($node->nid);
+    $this->assertTrue(db_result(db_query('SELECT COUNT([vid]) FROM [{node_revisions}] WHERE [nid] = %d and [vid] = %d', $node->nid, $vid)) == 0, 'Check to make sure revisions delete properly');    $this->cleanup($node->nid);
 
     $this->cleanup($node->nid);
   }
Index: tests/path_module.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/tests/Attic/path_module.test,v
retrieving revision 1.3
diff -u -p -r1.3 path_module.test
--- tests/path_module.test	28 Jan 2008 08:48:37 -0000	1.3
+++ tests/path_module.test	3 Apr 2008 08:53:52 -0000
@@ -124,7 +124,7 @@ class PathModuleTestCase extends DrupalT
   }
   
   function getPID($dst) {
-    return db_result(db_query("SELECT pid FROM {url_alias} WHERE dst = '%s'", $dst));
+    return db_result(db_query("SELECT [pid] FROM [{url_alias}] WHERE [dst] = %s", $dst));
   }
   
   function createNode() {
Index: tests/profile_module.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/tests/Attic/profile_module.test,v
retrieving revision 1.13
diff -u -p -r1.13 profile_module.test
--- tests/profile_module.test	28 Jan 2008 08:48:37 -0000	1.13
+++ tests/profile_module.test	3 Apr 2008 08:53:53 -0000
@@ -9,11 +9,11 @@ class ProfileModuleTestSingle extends Dr
   function _rolesApi($op, $edit) {
     if ($op == 'delete') {
       $id = $edit['rid'];
-      db_query('DELETE FROM {role} WHERE rid = %d', $id);
-      db_query('DELETE FROM {permission} WHERE rid = %d', $id);
+      db_query('DELETE FROM [{role}] WHERE [rid] = %d', $id);
+      db_query('DELETE FROM [{permission}] WHERE [rid] = %d', $id);
 
       // Update the users who have this role set:
-      $result = db_query('SELECT DISTINCT(ur1.uid) FROM {users_roles} ur1 LEFT JOIN {users_roles} ur2 ON ur2.uid = ur1.uid WHERE ur1.rid = %d AND ur2.rid != ur1.rid', $id);
+      $result = db_query('SELECT DISTINCT(ur1.[uid]) FROM [{users_roles}] ur1 LEFT JOIN [{users_roles}] ur2 ON ur2.[uid] = ur1.[uid] WHERE ur1.[rid] = %d AND ur2.[rid] != ur1.[rid]', $id);
       $uid = array();
 
       while ($u = db_fetch_object($result)) {
@@ -21,19 +21,19 @@ class ProfileModuleTestSingle extends Dr
       }
 
       if ($uid) {
-        db_query('DELETE FROM {users_roles} WHERE rid = %d AND uid IN (%s)', $id, implode(', ', $uid));
+        db_query('DELETE FROM [{users_roles}] WHERE [rid] = %d AND [uid] IN (%s)', $id, implode(', ', $uid));
       }
 
       // Users with only the deleted role are put back in the authenticated users pool.
-      db_query('UPDATE {users_roles} SET rid = %d WHERE rid = %d', DRUPAL_AUTHENTICATED_RID, $id);
+      db_query('UPDATE [{users_roles}] SET [rid] = %d WHERE [rid] = %d', DRUPAL_AUTHENTICATED_RID, $id);
 
     }
     else if ($op == 'add') {
       if (isset($edit['name'])) {
-        db_query("INSERT INTO {role} (name) VALUES ('%s')", $edit['name']);
-        $result = db_query("SELECT rid FROM {role} WHERE name = '%s'", $edit['name']);
+        db_query("INSERT INTO [{role}] ([name]) VALUES (%s)", $edit['name']);
+        $result = db_query("SELECT [rid] FROM [{role}] WHERE [name] = %s", $edit['name']);
         $rid = db_result($result);
-        db_query("INSERT INTO {permission} (rid, perm) VALUES (%d, '%s')", $rid, $edit['perm']);
+        db_query("INSERT INTO [{permission}] ([rid], [perm]) VALUES (%d, %s)", $rid, $edit['perm']);
         return $rid;
       }
       else {
@@ -70,7 +70,7 @@ class ProfileModuleTestSingle extends Dr
                   'explanation' => $explanation,
                   );
     $this->drupalPost('admin/user/profile/add/textfield', $edit, 'Save field',0);
-    $fid = db_result(db_query('SELECT fid FROM {profile_fields} WHERE title = "%s"', $title));
+    $fid = db_result(db_query('SELECT [fid] FROM [{profile_fields}] WHERE [title] = %s', $title));
     $single_field = array('title' => $title, 'form_name' => $form_name, 'explanation' => $explanation);
 
     // checking simple fields
@@ -106,8 +106,8 @@ class ProfileModuleTestSingle extends Dr
 
     // delete test user and roles
     if ($user->uid > 0) {
-      db_query('DELETE FROM {users} WHERE uid =%d', $user->uid);
-      db_query('DELETE FROM {users_roles} WHERE uid = %d', $user->uid);
+      db_query('DELETE FROM [{users}] WHERE [uid] =%d', $user->uid);
+      db_query('DELETE FROM [{users_roles}] WHERE [uid] = %d', $user->uid);
       module_invoke_all('user', 'delete', '', $user);
     }
 
@@ -127,11 +127,11 @@ class ProfileModuleTestTextarea extends 
   function _rolesApi($op, $edit) {
     if ($op == 'delete') {
       $id = $edit['rid'];
-      db_query('DELETE FROM {role} WHERE rid = %d', $id);
-      db_query('DELETE FROM {permission} WHERE rid = %d', $id);
+      db_query('DELETE FROM [{role}] WHERE [rid] = %d', $id);
+      db_query('DELETE FROM [{permission}] WHERE [rid] = %d', $id);
 
       // Update the users who have this role set:
-      $result = db_query('SELECT DISTINCT(ur1.uid) FROM {users_roles} ur1 LEFT JOIN {users_roles} ur2 ON ur2.uid = ur1.uid WHERE ur1.rid = %d AND ur2.rid != ur1.rid', $id);
+      $result = db_query('SELECT DISTINCT(ur1.[uid]) FROM [{users_roles}] ur1 LEFT JOIN [{users_roles}] ur2 ON ur2.[uid] = ur1.[uid] WHERE ur1.[rid] = %d AND ur2.[rid] != ur1.[rid]', $id);
       $uid = array();
 
       while ($u = db_fetch_object($result)) {
@@ -139,19 +139,19 @@ class ProfileModuleTestTextarea extends 
       }
 
       if ($uid) {
-        db_query('DELETE FROM {users_roles} WHERE rid = %d AND uid IN (%s)', $id, implode(', ', $uid));
+        db_query('DELETE FROM [{users_roles}] WHERE [rid] = %d AND [uid] IN (%s)', $id, implode(', ', $uid));
       }
 
       // Users with only the deleted role are put back in the authenticated users pool.
-      db_query('UPDATE {users_roles} SET rid = %d WHERE rid = %d', DRUPAL_AUTHENTICATED_RID, $id);
+      db_query('UPDATE [{users_roles}] SET [rid] = %d WHERE [rid] = %d', DRUPAL_AUTHENTICATED_RID, $id);
 
     }
     else if ($op == 'add') {
       if (isset($edit['name'])) {
-        db_query("INSERT INTO {role} (name) VALUES ('%s')", $edit['name']);
-        $result = db_query("SELECT rid FROM {role} WHERE name = '%s'", $edit['name']);
+        db_query("INSERT INTO [{role}] ([name]) VALUES (%s)", $edit['name']);
+        $result = db_query("SELECT [rid] FROM [{role}] WHERE [name] = %s", $edit['name']);
         $rid = db_result($result);
-        db_query("INSERT INTO {permission} (rid, perm) VALUES (%d, '%s')", $rid, $edit['perm']);
+        db_query("INSERT INTO [{permission}] ([rid], [perm]) VALUES (%d, %s)", $rid, $edit['perm']);
         return $rid;
       }
       else {
@@ -184,7 +184,7 @@ class ProfileModuleTestTextarea extends 
     $explanation = $this->randomName(50);
     $edit = array('category' => $my_category, 'title' => $title, 'name' => $form_name, 'explanation' => $explanation);
     $this->drupalPost("admin/user/profile/add/textarea", $edit, 'Save field' , 0);
-    $fid = db_result(db_query('SELECT fid FROM {profile_fields} WHERE title = "%s"', $title));
+    $fid = db_result(db_query('SELECT [fid] FROM [{profile_fields}] WHERE [title] = %s', $title));
     $single_field = array('title' => $title, 'form_name' => $form_name, 'explanation' => $explanation);
 
     // checking simple fields
@@ -220,8 +220,8 @@ class ProfileModuleTestTextarea extends 
 
     // delete test user and roles
     if ($user->uid > 0) {
-      db_query('DELETE FROM {users} WHERE uid =%d', $user->uid);
-      db_query('DELETE FROM {users_roles} WHERE uid = %d', $user->uid);
+      db_query('DELETE FROM [{users}] WHERE [uid] =%d', $user->uid);
+      db_query('DELETE FROM [{users_roles}] WHERE [uid] = %d', $user->uid);
       module_invoke_all('user', 'delete', '', $user);
     }
 
@@ -241,11 +241,11 @@ class ProfileModuleTestFreelist extends 
   function _rolesApi($op, $edit) {
     if ($op == 'delete') {
       $id = $edit['rid'];
-      db_query('DELETE FROM {role} WHERE rid = %d', $id);
-      db_query('DELETE FROM {permission} WHERE rid = %d', $id);
+      db_query('DELETE FROM [{role}] WHERE [rid] = %d', $id);
+      db_query('DELETE FROM [{permission}] WHERE [rid] = %d', $id);
 
       // Update the users who have this role set:
-      $result = db_query('SELECT DISTINCT(ur1.uid) FROM {users_roles} ur1 LEFT JOIN {users_roles} ur2 ON ur2.uid = ur1.uid WHERE ur1.rid = %d AND ur2.rid != ur1.rid', $id);
+      $result = db_query('SELECT DISTINCT(ur1.[uid]) FROM [{users_roles}] ur1 LEFT JOIN [{users_roles}] ur2 ON ur2.[uid] = ur1.[uid] WHERE ur1.[rid] = %d AND ur2.[rid] != ur1.[rid]', $id);
       $uid = array();
 
       while ($u = db_fetch_object($result)) {
@@ -253,19 +253,19 @@ class ProfileModuleTestFreelist extends 
       }
 
       if ($uid) {
-        db_query('DELETE FROM {users_roles} WHERE rid = %d AND uid IN (%s)', $id, implode(', ', $uid));
+        db_query('DELETE FROM [{users_roles}] WHERE [rid] = %d AND [uid] IN (%s)', $id, implode(', ', $uid));
       }
 
       // Users with only the deleted role are put back in the authenticated users pool.
-      db_query('UPDATE {users_roles} SET rid = %d WHERE rid = %d', DRUPAL_AUTHENTICATED_RID, $id);
+      db_query('UPDATE [{users_roles}] SET [rid] = %d WHERE [rid] = %d', DRUPAL_AUTHENTICATED_RID, $id);
 
     }
     else if ($op == 'add') {
       if (isset($edit['name'])) {
-        db_query("INSERT INTO {role} (name) VALUES ('%s')", $edit['name']);
-        $result = db_query("SELECT rid FROM {role} WHERE name = '%s'", $edit['name']);
+        db_query("INSERT INTO [{role}] ([name]) VALUES (%s)", $edit['name']);
+        $result = db_query("SELECT [rid] FROM [{role}] WHERE [name] = %s", $edit['name']);
         $rid = db_result($result);
-        db_query("INSERT INTO {permission} (rid, perm) VALUES (%d, '%s')", $rid, $edit['perm']);
+        db_query("INSERT INTO [{permission}] ([rid], [perm]) VALUES (%d, %s)", $rid, $edit['perm']);
         return $rid;
       }
       else {
@@ -298,7 +298,7 @@ class ProfileModuleTestFreelist extends 
     $explanation = $this->randomName(50);
     $edit = array('category' => $my_category, 'title' => $title, 'name' => $form_name, 'explanation' => $explanation);
     $this->drupalPost("admin/user/profile/add/list", $edit, 'Save field' , 0);
-    $fid = db_result(db_query('SELECT fid FROM {profile_fields} WHERE title = "%s"', $title));
+    $fid = db_result(db_query('SELECT [fid] FROM [{profile_fields}] WHERE [title] = %s', $title));
     $single_field = array('title' => $title, 'form_name' => $form_name, 'explanation' => $explanation);
 
     // checking simple fields
@@ -334,8 +334,8 @@ class ProfileModuleTestFreelist extends 
 
     // delete test user and roles
     if ($user->uid > 0) {
-      db_query('DELETE FROM {users} WHERE uid =%d', $user->uid);
-      db_query('DELETE FROM {users_roles} WHERE uid = %d', $user->uid);
+      db_query('DELETE FROM [{users}] WHERE [uid] = %d', $user->uid);
+      db_query('DELETE FROM [{users_roles}] WHERE [uid] = %d', $user->uid);
       module_invoke_all('user', 'delete', '', $user);
     }
 
@@ -356,11 +356,11 @@ class ProfileModuleTestCheckbox extends 
   function _rolesApi($op, $edit) {
     if ($op == 'delete') {
       $id = $edit['rid'];
-      db_query('DELETE FROM {role} WHERE rid = %d', $id);
-      db_query('DELETE FROM {permission} WHERE rid = %d', $id);
+      db_query('DELETE FROM [{role}] WHERE [rid] = %d', $id);
+      db_query('DELETE FROM [{permission}] WHERE [rid] = %d', $id);
 
       // Update the users who have this role set:
-      $result = db_query('SELECT DISTINCT(ur1.uid) FROM {users_roles} ur1 LEFT JOIN {users_roles} ur2 ON ur2.uid = ur1.uid WHERE ur1.rid = %d AND ur2.rid != ur1.rid', $id);
+      $result = db_query('SELECT DISTINCT(ur1.[uid]) FROM [{users_roles}] ur1 LEFT JOIN [{users_roles}] ur2 ON ur2.[uid] = ur1.[uid] WHERE ur1.[rid] = %d AND ur2.[rid] != ur1.[rid]', $id);
       $uid = array();
 
       while ($u = db_fetch_object($result)) {
@@ -368,19 +368,19 @@ class ProfileModuleTestCheckbox extends 
       }
 
       if ($uid) {
-        db_query('DELETE FROM {users_roles} WHERE rid = %d AND uid IN (%s)', $id, implode(', ', $uid));
+        db_query('DELETE FROM [{users_roles}] WHERE [rid] = %d AND [uid] IN (%s)', $id, implode(', ', $uid));
       }
 
       // Users with only the deleted role are put back in the authenticated users pool.
-      db_query('UPDATE {users_roles} SET rid = %d WHERE rid = %d', DRUPAL_AUTHENTICATED_RID, $id);
+      db_query('UPDATE [{users_roles}] SET [rid] = %d WHERE [rid] = %d', DRUPAL_AUTHENTICATED_RID, $id);
 
     }
     else if ($op == 'add') {
       if (isset($edit['name'])) {
-        db_query("INSERT INTO {role} (name) VALUES ('%s')", $edit['name']);
-        $result = db_query("SELECT rid FROM {role} WHERE name = '%s'", $edit['name']);
+        db_query("INSERT INTO [{role}] ([name]) VALUES (%s)", $edit['name']);
+        $result = db_query("SELECT [rid] FROM [{role}] WHERE [name] = %s", $edit['name']);
         $rid = db_result($result);
-        db_query("INSERT INTO {permission} (rid, perm) VALUES (%d, '%s')", $rid, $edit['perm']);
+        db_query("INSERT INTO [{permission}] ([rid], [perm]) VALUES (%d, %s)", $rid, $edit['perm']);
         return $rid;
       }
       else {
@@ -413,7 +413,7 @@ class ProfileModuleTestCheckbox extends 
     $explanation = $this->randomName(50);
     $edit = array('category' => $my_category, 'title' => $title, 'name' => $form_name, 'explanation' => $explanation);
     $this->drupalPost("admin/user/profile/add/checkbox", $edit, 'Save field' , 0);
-    $fid = db_result(db_query('SELECT fid FROM {profile_fields} WHERE title = "%s"', $title));
+    $fid = db_result(db_query('SELECT [fid] FROM [{profile_fields}] WHERE [title] = "%s"', $title));
     $single_field = array('title' => $title, 'form_name' => $form_name, 'explanation' => $explanation);
 
     // checking simple fields
@@ -448,8 +448,8 @@ class ProfileModuleTestCheckbox extends 
 
     // delete test user and roles
     if ($user->uid > 0) {
-      db_query('DELETE FROM {users} WHERE uid =%d', $user->uid);
-      db_query('DELETE FROM {users_roles} WHERE uid = %d', $user->uid);
+      db_query('DELETE FROM [{users}] WHERE [uid] = %d', $user->uid);
+      db_query('DELETE FROM [{users_roles}] WHERE [uid] = %d', $user->uid);
       module_invoke_all('user', 'delete', '', $user);
     }
 
@@ -468,11 +468,11 @@ class ProfileModuleTestUrl extends Drupa
   function _rolesApi($op, $edit) {
     if ($op == 'delete') {
       $id = $edit['rid'];
-      db_query('DELETE FROM {role} WHERE rid = %d', $id);
-      db_query('DELETE FROM {permission} WHERE rid = %d', $id);
+      db_query('DELETE FROM [{role}] WHERE [rid] = %d', $id);
+      db_query('DELETE FROM [{permission}] WHERE [rid] = %d', $id);
 
       // Update the users who have this role set:
-      $result = db_query('SELECT DISTINCT(ur1.uid) FROM {users_roles} ur1 LEFT JOIN {users_roles} ur2 ON ur2.uid = ur1.uid WHERE ur1.rid = %d AND ur2.rid != ur1.rid', $id);
+      $result = db_query('SELECT DISTINCT(ur1.[uid]) FROM [{users_roles}] ur1 LEFT JOIN [{users_roles}] ur2 ON ur2.[uid] = ur1.[uid] WHERE ur1.[rid] = %d AND ur2.[rid] != ur1.[rid]', $id);
       $uid = array();
 
       while ($u = db_fetch_object($result)) {
@@ -480,19 +480,19 @@ class ProfileModuleTestUrl extends Drupa
       }
 
       if ($uid) {
-        db_query('DELETE FROM {users_roles} WHERE rid = %d AND uid IN (%s)', $id, implode(', ', $uid));
+        db_query('DELETE FROM [{users_roles}] WHERE [rid] = %d AND [uid] IN (%s)', $id, implode(', ', $uid));
       }
 
       // Users with only the deleted role are put back in the authenticated users pool.
-      db_query('UPDATE {users_roles} SET rid = %d WHERE rid = %d', DRUPAL_AUTHENTICATED_RID, $id);
+      db_query('UPDATE [{users_roles}] SET [rid] = %d WHERE [rid] = %d', DRUPAL_AUTHENTICATED_RID, $id);
 
     }
     else if ($op == 'add') {
       if (isset($edit['name'])) {
-        db_query("INSERT INTO {role} (name) VALUES ('%s')", $edit['name']);
-        $result = db_query("SELECT rid FROM {role} WHERE name = '%s'", $edit['name']);
+        db_query("INSERT INTO [{role}] ([name]) VALUES (%s)", $edit['name']);
+        $result = db_query("SELECT [rid] FROM [{role}] WHERE [name] = %s", $edit['name']);
         $rid = db_result($result);
-        db_query("INSERT INTO {permission} (rid, perm) VALUES (%d, '%s')", $rid, $edit['perm']);
+        db_query("INSERT INTO [{permission}] ([rid], [perm]) VALUES (%d, %s)", $rid, $edit['perm']);
         return $rid;
       }
       else {
@@ -526,7 +526,7 @@ class ProfileModuleTestUrl extends Drupa
     $explanation = $this->randomName(50);
     $edit = array('category' => $my_category, 'title' => $title, 'name' => $form_name, 'explanation' => $explanation);
     $this->drupalPost("admin/user/profile/add/url", $edit, 'Save field' , 0);
-    $fid = db_result(db_query('SELECT fid FROM {profile_fields} WHERE title = "%s"', $title));
+    $fid = db_result(db_query('SELECT [fid] FROM [{profile_fields}] WHERE [title] = %s', $title));
     $single_field = array('title' => $title, 'form_name' => $form_name, 'explanation' => $explanation);
 
     // checking simple fields
@@ -562,8 +562,8 @@ class ProfileModuleTestUrl extends Drupa
 
     // delete test user and roles
     if ($user->uid > 0) {
-      db_query('DELETE FROM {users} WHERE uid =%d', $user->uid);
-      db_query('DELETE FROM {users_roles} WHERE uid = %d', $user->uid);
+      db_query('DELETE FROM [{users}] WHERE [uid] = %d', $user->uid);
+      db_query('DELETE FROM [{users_roles}] WHERE [uid] = %d', $user->uid);
       module_invoke_all('user', 'delete', '', $user);
     }
 
@@ -583,11 +583,11 @@ class ProfileModuleTestSelection extends
   function _rolesApi($op, $edit) {
     if ($op == 'delete') {
       $id = $edit['rid'];
-      db_query('DELETE FROM {role} WHERE rid = %d', $id);
-      db_query('DELETE FROM {permission} WHERE rid = %d', $id);
+      db_query('DELETE FROM [{role}] WHERE [rid] = %d', $id);
+      db_query('DELETE FROM [{permission}] WHERE [rid] = %d', $id);
 
       // Update the users who have this role set:
-      $result = db_query('SELECT DISTINCT(ur1.uid) FROM {users_roles} ur1 LEFT JOIN {users_roles} ur2 ON ur2.uid = ur1.uid WHERE ur1.rid = %d AND ur2.rid != ur1.rid', $id);
+      $result = db_query('SELECT DISTINCT(ur1.[uid]) FROM [{users_roles}] ur1 LEFT JOIN [{users_roles}] ur2 ON ur2.[uid] = ur1.[uid] WHERE ur1.[rid] = %d AND ur2.[rid] != ur1.[rid]', $id);
       $uid = array();
 
       while ($u = db_fetch_object($result)) {
@@ -595,19 +595,19 @@ class ProfileModuleTestSelection extends
       }
 
       if ($uid) {
-        db_query('DELETE FROM {users_roles} WHERE rid = %d AND uid IN (%s)', $id, implode(', ', $uid));
+        db_query('DELETE FROM [{users_roles}] WHERE [rid] = %d AND [uid] IN (%s)', $id, implode(', ', $uid));
       }
 
       // Users with only the deleted role are put back in the authenticated users pool.
-      db_query('UPDATE {users_roles} SET rid = %d WHERE rid = %d', DRUPAL_AUTHENTICATED_RID, $id);
+      db_query('UPDATE [{users_roles}] SET [rid] = %d WHERE [rid] = %d', DRUPAL_AUTHENTICATED_RID, $id);
 
     }
     else if ($op == 'add') {
       if (isset($edit['name'])) {
-        db_query("INSERT INTO {role} (name) VALUES ('%s')", $edit['name']);
-        $result = db_query("SELECT rid FROM {role} WHERE name = '%s'", $edit['name']);
+        db_query("INSERT INTO [{role}] ([name]) VALUES (%s)", $edit['name']);
+        $result = db_query("SELECT [rid] FROM [{role}] WHERE [name] = %s", $edit['name']);
         $rid = db_result($result);
-        db_query("INSERT INTO {permission} (rid, perm) VALUES (%d, '%s')", $rid, $edit['perm']);
+        db_query("INSERT INTO [{permission}] ([rid], [perm]) VALUES (%d, %s)", $rid, $edit['perm']);
         return $rid;
       }
       else {
@@ -643,7 +643,7 @@ class ProfileModuleTestSelection extends
       $options .= $this->randomName(8) . "\n";
     $edit = array('category' => $my_category, 'title' => $title, 'name' => $form_name, 'explanation' => $explanation, 'options' => $options);
     $this->drupalPost("admin/user/profile/add/selection", $edit, 'Save field' , 0);
-    $fid = db_result(db_query('SELECT fid FROM {profile_fields} WHERE title = "%s"', $title));
+    $fid = db_result(db_query('SELECT [fid] FROM [{profile_fields}] WHERE [title] = %s', $title));
     $single_field = array('title' => $title, 'form_name' => $form_name, 'explanation' => $explanation);
 
     // checking simple fields
@@ -685,8 +685,8 @@ class ProfileModuleTestSelection extends
 
     // delete test user and roles
     if ($user->uid > 0) {
-      db_query('DELETE FROM {users} WHERE uid =%d', $user->uid);
-      db_query('DELETE FROM {users_roles} WHERE uid = %d', $user->uid);
+      db_query('DELETE FROM [{users}] WHERE [uid] = %d', $user->uid);
+      db_query('DELETE FROM [{users_roles}] WHERE [uid] = %d', $user->uid);
       module_invoke_all('user', 'delete', '', $user);
     }
 
@@ -708,11 +708,11 @@ class ProfileModuleTestDate extends Drup
   function _rolesApi($op, $edit) {
     if ($op == 'delete') {
       $id = $edit['rid'];
-      db_query('DELETE FROM {role} WHERE rid = %d', $id);
-      db_query('DELETE FROM {permission} WHERE rid = %d', $id);
+      db_query('DELETE FROM [{role}] WHERE [rid] = %d', $id);
+      db_query('DELETE FROM [{permission}] WHERE [rid] = %d', $id);
 
       // Update the users who have this role set:
-      $result = db_query('SELECT DISTINCT(ur1.uid) FROM {users_roles} ur1 LEFT JOIN {users_roles} ur2 ON ur2.uid = ur1.uid WHERE ur1.rid = %d AND ur2.rid != ur1.rid', $id);
+      $result = db_query('SELECT DISTINCT(ur1.[uid]) FROM [{users_roles}] ur1 LEFT JOIN [{users_roles}] ur2 ON ur2.[uid] = ur1.[uid] WHERE ur1.[rid] = %d AND ur2.[rid] != ur1.[rid]', $id);
       $uid = array();
 
       while ($u = db_fetch_object($result)) {
@@ -720,19 +720,19 @@ class ProfileModuleTestDate extends Drup
       }
 
       if ($uid) {
-        db_query('DELETE FROM {users_roles} WHERE rid = %d AND uid IN (%s)', $id, implode(', ', $uid));
+        db_query('DELETE FROM [{users_roles}] WHERE [rid] = %d AND [uid] IN (%s)', $id, implode(', ', $uid));
       }
 
       // Users with only the deleted role are put back in the authenticated users pool.
-      db_query('UPDATE {users_roles} SET rid = %d WHERE rid = %d', DRUPAL_AUTHENTICATED_RID, $id);
+      db_query('UPDATE [{users_roles}] SET [rid] = %d WHERE [rid] = %d', DRUPAL_AUTHENTICATED_RID, $id);
 
     }
     else if ($op == 'add') {
       if (isset($edit['name'])) {
-        db_query("INSERT INTO {role} (name) VALUES ('%s')", $edit['name']);
-        $result = db_query("SELECT rid FROM {role} WHERE name = '%s'", $edit['name']);
+        db_query("INSERT INTO [{role}] ([name]) VALUES (%s)", $edit['name']);
+        $result = db_query("SELECT [rid] FROM [{role}] WHERE [name] = %s", $edit['name']);
         $rid = db_result($result);
-        db_query("INSERT INTO {permission} (rid, perm) VALUES (%d, '%s')", $rid, $edit['perm']);
+        db_query("INSERT INTO [{permission}] ([rid], [perm]) VALUES (%d, %s)", $rid, $edit['perm']);
         return $rid;
       }
       else {
@@ -768,7 +768,7 @@ class ProfileModuleTestDate extends Drup
       $options .= $this->randomName(8) . "\n";*/
     $edit = array('category' => $my_category, 'title' => $title, 'name' => $form_name, 'explanation' => $explanation);
     $this->drupalPost("admin/user/profile/add/date", $edit, 'Save field' , 0);
-    $fid = db_result(db_query('SELECT fid FROM {profile_fields} WHERE title = "%s"', $title));
+    $fid = db_result(db_query('SELECT [fid] FROM [{profile_fields}] WHERE [title] = %s', $title));
     $single_field = array('title' => $title, 'form_name' => $form_name, 'explanation' => $explanation);
 
     // checking simple fields
@@ -814,8 +814,8 @@ class ProfileModuleTestDate extends Drup
 
     // delete test user and roles
     if ($user->uid > 0) {
-      db_query('DELETE FROM {users} WHERE uid =%d', $user->uid);
-      db_query('DELETE FROM {users_roles} WHERE uid = %d', $user->uid);
+      db_query('DELETE FROM [{users}] WHERE [uid] = %d', $user->uid);
+      db_query('DELETE FROM [{users_roles}] WHERE [uid] = %d', $user->uid);
       module_invoke_all('user', 'delete', '', $user);
     }
 
@@ -837,11 +837,11 @@ class ProfileModuleTest2 extends DrupalT
   function _rolesApi($op, $edit) {
     if ($op == 'delete') {
       $id = $edit['rid'];
-      db_query('DELETE FROM {role} WHERE rid = %d', $id);
-      db_query('DELETE FROM {permission} WHERE rid = %d', $id);
+      db_query('DELETE FROM [{role}] WHERE [rid] = %d', $id);
+      db_query('DELETE FROM [{permission}] WHERE [rid] = %d', $id);
 
       // Update the users who have this role set:
-      $result = db_query('SELECT DISTINCT(ur1.uid) FROM {users_roles} ur1 LEFT JOIN {users_roles} ur2 ON ur2.uid = ur1.uid WHERE ur1.rid = %d AND ur2.rid != ur1.rid', $id);
+      $result = db_query('SELECT DISTINCT(ur1.[uid]) FROM [{users_roles}] ur1 LEFT JOIN [{users_roles}] ur2 ON ur2.[uid] = ur1.[uid] WHERE ur1.[rid] = %d AND ur2.[rid] != ur1.[rid]', $id);
       $uid = array();
 
       while ($u = db_fetch_object($result)) {
@@ -849,19 +849,19 @@ class ProfileModuleTest2 extends DrupalT
       }
 
       if ($uid) {
-        db_query('DELETE FROM {users_roles} WHERE rid = %d AND uid IN (%s)', $id, implode(', ', $uid));
+        db_query('DELETE FROM [{users_roles}] WHERE [rid] = %d AND [uid] IN (%s)', $id, implode(', ', $uid));
       }
 
       // Users with only the deleted role are put back in the authenticated users pool.
-      db_query('UPDATE {users_roles} SET rid = %d WHERE rid = %d', DRUPAL_AUTHENTICATED_RID, $id);
+      db_query('UPDATE [{users_roles}] SET [rid] = %d WHERE [rid] = %d', DRUPAL_AUTHENTICATED_RID, $id);
 
     }
     else if ($op == 'add') {
       if (isset($edit['name'])) {
-        db_query("INSERT INTO {role} (name) VALUES ('%s')", $edit['name']);
-        $result = db_query("SELECT rid FROM {role} WHERE name = '%s'", $edit['name']);
+        db_query("INSERT INTO [{role}] ([name]) VALUES (%s)", $edit['name']);
+        $result = db_query("SELECT [rid] FROM [{role}] WHERE [name] = %s", $edit['name']);
         $rid = db_result($result);
-        db_query("INSERT INTO {permission} (rid, perm) VALUES (%d, '%s')", $rid, $edit['perm']);
+        db_query("INSERT INTO [{permission}] ([rid], [perm]) VALUES (%d, %s)", $rid, $edit['perm']);
         return $rid;
       }
       else {
@@ -895,7 +895,7 @@ class ProfileModuleTest2 extends DrupalT
     $weight = 3;
     $edit = array('category' => $my_category, 'title' => $title, 'name' => $form_name, 'weight' => $weight, 'required' => 1);
     $this->drupalPost("admin/user/profile/add/textfield", $edit, 'Save field', 0);
-    $fid = db_result(db_query('SELECT fid FROM {profile_fields} WHERE title = "%s"', $title));
+    $fid = db_result(db_query('SELECT [fid] FROM [{profile_fields}] WHERE [title] = %s', $title));
     $sfield1 = array('fid'=> $fid, 'title' => $title);
     //second one line textfield
     $title = "second_" . $this->randomName(10);
@@ -904,7 +904,7 @@ class ProfileModuleTest2 extends DrupalT
     $weight = -2;
     $edit = array('category' => $my_category, 'title' => $title, 'name' => $form_name, 'weight' => $weight, 'register' => 1, 'required' => 1);
     $this->drupalPost("admin/user/profile/add/textfield", $edit, 'Save field', 0);
-    $fid = db_result(db_query('SELECT fid FROM {profile_fields} WHERE title = "%s"', $title));
+    $fid = db_result(db_query('SELECT [fid] FROM [{profile_fields}] WHERE [title] = %s', $title));
     $sfield2 = array('fid'=> $fid, 'title' => $title);
     // checking
     $this->_browser->get(url("user/". $user->uid. "/edit/$my_category"));
@@ -942,7 +942,7 @@ class ProfileModuleTest2 extends DrupalT
       $options .= $this->randomName(8) . "\n";
     $edit = array('category' => $my_category, 'title' => $title, 'name' => $form_name, 'page' => $page_title, 'options' => $options);
     $this->drupalPost("admin/user/profile/add/selection", $edit, 'Save field', 0);
-    $fid = db_result(db_query('SELECT fid FROM {profile_fields} WHERE title = "%s"', $title));
+    $fid = db_result(db_query('SELECT [fid] FROM [{profile_fields}] WHERE [title] = %s', $title));
     $element = rand(0,2);
     $op_tab = explode("\n", $options,3);
     $choice = rtrim($op_tab[$element]);
@@ -959,9 +959,9 @@ class ProfileModuleTest2 extends DrupalT
     }
     // delete test user and roles
     if ($user->uid > 0) {
-      db_query('DELETE FROM {users} WHERE uid =' .
+      db_query('DELETE FROM [{users}] WHERE [uid] =' .
           ' %d', $user->uid);
-      db_query('DELETE FROM {users_roles} WHERE uid = %d', $user->uid);
+      db_query('DELETE FROM [{users_roles}] WHERE [uid] = %d', $user->uid);
       module_invoke_all('user', 'delete', '', $user);
     }
     //delete roles
Index: tests/taxonomy.module.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/tests/Attic/taxonomy.module.test,v
retrieving revision 1.13
diff -u -p -r1.13 taxonomy.module.test
--- tests/taxonomy.module.test	28 Jan 2008 08:48:37 -0000	1.13
+++ tests/taxonomy.module.test	3 Apr 2008 08:53:53 -0000
@@ -314,7 +314,7 @@ class TaxonomyTestNodeApi extends Drupal
     }
     
     // checking database fields
-    $result = db_query('SELECT tid FROM {term_node} WHERE nid = %d', $node->nid);
+    $result = db_query('SELECT [tid] FROM [{term_node}] WHERE [nid] = %d', $node->nid);
     while ($nodeRow = db_fetch_array($result)) {
       $this->assertTrue(in_array($nodeRow['tid'], $parent), 'Checking database record');
     }
@@ -350,7 +350,7 @@ class TaxonomyTestNodeApi extends Drupal
     }
     
     // checking database fields
-    $result = db_query('SELECT tid FROM {term_node} WHERE nid = %d', $node->nid);
+    $result = db_query('SELECT [tid] FROM [{term_node}] WHERE [nid] = %d', $node->nid);
     while ($nodeRow = db_fetch_array($result)) {
       $this->assertTrue(in_array($nodeRow['tid'], $parent), 'Checking database field');
     }
@@ -361,7 +361,7 @@ class TaxonomyTestNodeApi extends Drupal
     $this->_browser->get(url("node/".$node->nid));
     $this->assertNoUnwantedText($termname, "Checking if node exists");
     // checking database fields
-    $num_rows = db_result(db_query('SELECT COUNT(*) FROM {term_node} WHERE nid = %d', $node->nid));
+    $num_rows = db_result(db_query('SELECT COUNT(*) FROM [{term_node}] WHERE [nid] = %d', $node->nid));
     $this->assertEqual($num_rows, 0, 'Checking database field after deletion');
 
     // delete vocabulary
Index: tests/user_module.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/tests/Attic/user_module.test,v
retrieving revision 1.3
diff -u -p -r1.3 user_module.test
--- tests/user_module.test	28 Jan 2008 08:48:37 -0000	1.3
+++ tests/user_module.test	3 Apr 2008 08:53:53 -0000
@@ -99,9 +99,9 @@ class UserRegistrationTest extends Drupa
     $this->assertText(t('Edit'), 'Edit tab on the profile page');
 
     /* delete test user, roles and maybe authmap */
-    db_query('DELETE FROM {users} WHERE uid = %d', $user->uid);
-    db_query('DELETE FROM {users_roles} WHERE uid = %d', $user->uid);
-    db_query('DELETE FROM {authmap} WHERE uid = %d', $user->uid);
+    db_query('DELETE FROM [{users}] WHERE [uid] = %d', $user->uid);
+    db_query('DELETE FROM [{users_roles}] WHERE [uid] = %d', $user->uid);
+    db_query('DELETE FROM [{authmap}] WHERE [uid] = %d', $user->uid);
   }
 }
 
@@ -164,7 +164,7 @@ class UserAccessTest extends DrupalTestC
   }
 
   function _addMask($mask, $type, $status = 0) {
-    db_query("INSERT INTO {access} (mask, type, status) VALUES ('%s', '%s', %d)", $mask, $type, $status);
+    db_query("INSERT INTO [{access}] ([mask], [type], [status]) VALUES (%s, %s, %d)", $mask, $type, $status);
     $aid = db_last_insert_id('access', 'aid');
     $str_status = ($status == 0) ? 'deny' : 'allow';
     $this->assertTrue(db_affected_rows() > 0, "$str_status Mask added for $type '$mask'");
@@ -174,7 +174,7 @@ class UserAccessTest extends DrupalTestC
   function tearDown() {
     while (sizeof($this->_cleanup_masks) > 0) {
       $aid = array_pop($this->_cleanup_masks);
-      db_query("DELETE FROM {access} WHERE aid = %d", $aid);
+      db_query("DELETE FROM [{access}] WHERE [aid] = %d", $aid);
     }
   }
 
@@ -216,9 +216,9 @@ class UserAccessTest extends DrupalTestC
     $this->assertTrue(($user->uid > 0), 'uid > 0');
     if (isset($user->uid) && ($user->uid > 0)) {
       /* delete test user, roles and maybe authmap */
-      db_query('DELETE FROM {users} WHERE uid = %d', $user->uid);
-      db_query('DELETE FROM {users_roles} WHERE uid = %d', $user->uid);
-      db_query('DELETE FROM {authmap} WHERE uid = %d', $user->uid);
+      db_query('DELETE FROM [{users}] WHERE [uid] = %d', $user->uid);
+      db_query('DELETE FROM [{users_roles}] WHERE [uid] = %d', $user->uid);
+      db_query('DELETE FROM [{authmap}] WHERE [uid] = %d', $user->uid);
     }
   }
 }