diff -Naur engines_new/importexportapi_db_put.inc engines/importexportapi_db_put.inc
--- engines_new/importexportapi_db_put.inc	2009-12-13 11:53:12.000000000 -0700
+++ engines/importexportapi_db_put.inc	2009-07-07 08:08:50.000000000 -0600
@@ -127,7 +127,7 @@
       // marked as 'unique'. If any values do already exist for these fields,
       // then abort this query altogether.
       if ($is_insert && !empty($unique_fields)) {
-        $unique_fields_sql = 'SELECT * FROM '. $into .' WHERE '. implode(' OR ', $unique_fields['sql']);
+        $unique_fields_sql = 'SELECT * FROM {'. $into .'} WHERE '. implode(' OR ', $unique_fields['sql']);
         $result = db_fetch_object(db_query($unique_fields_sql, $unique_fields['values']));
 
         if (!empty($result)) {
@@ -530,7 +530,7 @@
         $value_old = NULL;
 
         $key_provided = isset($value);
-        $key_already_exists = (bool) db_result(db_query('SELECT COUNT('. $key_put['#db_field_unaliased'] .') FROM '. $into .' WHERE '. $key_put['#db_field_unaliased'] .' = '. $placeholder_map[$key_field['#type']], $value));
+        $key_already_exists = (bool) db_result(db_query('SELECT COUNT('. $key_put['#db_field_unaliased'] .') FROM {'. $into .'} WHERE '. $key_put['#db_field_unaliased'] .' = '. $placeholder_map[$key_field['#type']], $value));
         $update_existing = $key_put['#db_update_existing'];
         $generate_id = $key_put['#db_generate_id'];
         $force_generate_id = $key_put['#db_force_generate_id'];
@@ -623,7 +623,7 @@
 
           // Alternate key fields need to be updated in the database
           // immediately, otherwise duplicate key errors can occur.
-          $sql = 'SELECT '. $key_put['#db_field_unaliased'] .' FROM '. $into .' WHERE '. $alt_key_db_field .' = '. $placeholder_map[$alt_key_field['#type']];
+          $sql = 'SELECT '. $key_put['#db_field_unaliased'] .' FROM {'. $into .'} WHERE '. $alt_key_db_field .' = '. $placeholder_map[$alt_key_field['#type']];
           $result = db_fetch_object(db_query($sql, $alt_key_field['#value']));
 
           if (!empty($result) && (!isset($result->$alt_key_db_field) || $result->$alt_key_db_field === '')) {
@@ -825,7 +825,7 @@
             $into = '{importexportapi_db_put_map}';
             $sql = '';
 
-            $check_sql = 'SELECT * FROM '. $into ." WHERE put_id = %d AND entity = '%s' AND field = '%s' AND value_old = %d";
+            $check_sql = 'SELECT * FROM {'. $into ."} WHERE put_id = %d AND entity = '%s' AND field = '%s' AND value_old = %d";
             $result = db_fetch_object(db_query($check_sql, $put_id, $entity_index, $field_path, $value_old));
             $is_insert = empty($result);
 
@@ -844,7 +844,7 @@
             $into = '{importexportapi_db_put_map_alt}';
             $sql = '';
 
-            $check_sql = 'SELECT * FROM '. $into ." WHERE put_id = %d AND entity = '%s' AND field = '%s' AND alt_field = '%s' AND value_alt = '%s'";
+            $check_sql = 'SELECT * FROM {'. $into ."} WHERE put_id = %d AND entity = '%s' AND field = '%s' AND alt_field = '%s' AND value_alt = '%s'";
             $result = db_fetch_object(db_query($check_sql, $put_id, $entity_index, $field_path, $key_field, $value_old));
             $is_insert = empty($result);