Index: dba.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/dba/dba.module,v
retrieving revision 1.17
diff -u -r1.17 dba.module
--- dba.module	2 Oct 2004 10:09:41 -0000	1.17
+++ dba.module	27 Oct 2004 10:40:04 -0000
@@ -375,7 +375,7 @@
     $key = $edit['key'];
     $keyid = $edit['keyid'];
     $table = $edit['table'];
-    $query = "DELETE FROM $table WHERE $key = \"$keyid\"";
+    $query = "DELETE FROM {$table} WHERE $key = \"$keyid\"";
     drupal_set_message($query);
     db_query($query);
   }
@@ -673,7 +673,7 @@
     $result = db_query('show tables');
   }
   else {
-    $result = db_query('SELECT DISTINCT tabname as Table FROM drupal_system_catalog');
+    $result = db_query('SELECT DISTINCT tabname as Table FROM {drupal_system_catalog}');
   }
 
   while ($tables = db_fetch_object($result)) {
@@ -700,7 +700,7 @@
     $database = preg_replace('/^Tables_in_/', '', $database[0]);
   }
   else {
-    $result = db_fetch_object(db_query('SELECT DISTINCT dbname FROM drupal_system_catalog LIMIT 1'));
+    $result = db_fetch_object(db_query('SELECT DISTINCT dbname FROM {drupal_system_catalog} LIMIT 1'));
     $database = $result->dbname;
   }
 
@@ -719,7 +719,7 @@
   }
   else {
     // lowercase of names of resulting columns seems to be important for postgresql
-    $result = db_query("SELECT colname as field FROM drupal_system_catalog WHERE tabname = '".$table."'");
+    $result = db_query("SELECT colname as field FROM {drupal_system_catalog} WHERE tabname = '".$table."'");
     while ($row = db_fetch_object($result)) {
       $fields[] = $row->field;
     }
@@ -755,7 +755,7 @@
   }
   else {
     // lower case names of resulting colums are important for PostgreSQL
-    $query = "SELECT tabname as table, colname as field, coltype as type, colnull as null, coldefault as default, colextra as extra FROM drupal_system_catalog WHERE tabname = '{$table}' ORDER BY colextra;";
+    $query = "SELECT tabname as table, colname as field, coltype as type, colnull as null, coldefault as default, colextra as extra FROM {drupal_system_catalog} WHERE tabname = '{$table}' ORDER BY colextra;";
   }
   if ($verbose) {
     drupal_set_message($query);
@@ -769,7 +769,7 @@
   $output .= "-- Dumping data for table '$table'\n";
   $output .= "--\n\n";
 
-  $result = db_query("select * from $table");
+  $result = db_query("SELECT * FROM {$table}");
   $numrow = db_num_rows($result);
   $fields = dba_get_fields($table);
   $num_fields = sizeof($fields);