diff -urN feeds.orig/feeds_defaults/tests/feeds_defaults.test feeds/feeds_defaults/tests/feeds_defaults.test
--- feeds.orig/feeds_defaults/tests/feeds_defaults.test	2010-01-12 16:19:43.000000000 +0100
+++ feeds/feeds_defaults/tests/feeds_defaults.test	2010-02-09 23:12:28.000000000 +0100
@@ -88,28 +88,28 @@
     $nid = $this->createFeedNode('feed', NULL, '', 'feed');
 
     // Assert results.
-    $count = db_result(db_query('SELECT COUNT(*) FROM {node} WHERE type = "feed_item"'));
+    $count = db_result(db_query("SELECT COUNT(*) FROM {node} WHERE type = 'feed_item'"));
     $this->assertEqual($count, 10, 'Found the correct number of feed item nodes in database.');
 
-    $count = db_result(db_query('SELECT COUNT(*) FROM {feeds_node_item}'));
+    $count = db_result(db_query("SELECT COUNT(*) FROM {feeds_node_item}"));
     $this->assertEqual($count, 10, 'Found the correct number of records in feeds_node_item.');
 
-    $count = db_result(db_query('SELECT COUNT(*) FROM {node} WHERE title = "Open Atrium Translation Workflow: Two Way Translation Updates"'));
+    $count = db_result(db_query("SELECT COUNT(*) FROM {node} WHERE title = 'Open Atrium Translation Workflow: Two Way Translation Updates'"));
     $this->assertEqual($count, 1, 'Found title.');
-    $count = db_result(db_query('SELECT COUNT(*) FROM {node} WHERE title = "Week in DC Tech: October 5th Edition"'));
+    $count = db_result(db_query("SELECT COUNT(*) FROM {node} WHERE title = 'Week in DC Tech: October 5th Edition'"));
     $this->assertEqual($count, 1, 'Found title.');
-    $count = db_result(db_query('SELECT COUNT(*) FROM {node} WHERE title = "Integrating the Siteminder Access System in an Open Atrium-based Intranet"'));
+    $count = db_result(db_query("SELECT COUNT(*) FROM {node} WHERE title = 'Integrating the Siteminder Access System in an Open Atrium-based Intranet'"));
     $this->assertEqual($count, 1, 'Found title.');
-    $count = db_result(db_query('SELECT COUNT(*) FROM {node} WHERE title = "Scaling the Open Atrium UI"'));
+    $count = db_result(db_query("SELECT COUNT(*) FROM {node} WHERE title = 'Scaling the Open Atrium UI'"));
     $this->assertEqual($count, 1, 'Found title.');
 
-    $count = db_result(db_query('SELECT COUNT(*) FROM {feeds_node_item} WHERE url = "http://developmentseed.org/blog/2009/oct/06/open-atrium-translation-workflow-two-way-updating"'));
+    $count = db_result(db_query("SELECT COUNT(*) FROM {feeds_node_item} WHERE url = 'http://developmentseed.org/blog/2009/oct/06/open-atrium-translation-workflow-two-way-updating'"));
     $this->assertEqual($count, 1, 'Found feed_node_item record.');
-    $count = db_result(db_query('SELECT COUNT(*) FROM {feeds_node_item} WHERE url = "http://developmentseed.org/blog/2009/oct/05/week-dc-tech-october-5th-edition"'));
+    $count = db_result(db_query("SELECT COUNT(*) FROM {feeds_node_item} WHERE url = 'http://developmentseed.org/blog/2009/oct/05/week-dc-tech-october-5th-edition'"));
     $this->assertEqual($count, 1, 'Found feed_node_item record.');
-    $count = db_result(db_query('SELECT COUNT(*) FROM {feeds_node_item} WHERE guid = "974 at http://developmentseed.org"'));
+    $count = db_result(db_query("SELECT COUNT(*) FROM {feeds_node_item} WHERE guid = '974 at http://developmentseed.org'"));
     $this->assertEqual($count, 1, 'Found feed_node_item record.');
-    $count = db_result(db_query('SELECT COUNT(*) FROM {feeds_node_item} WHERE guid = "970 at http://developmentseed.org"'));
+    $count = db_result(db_query("SELECT COUNT(*) FROM {feeds_node_item} WHERE guid = '970 at http://developmentseed.org'"));
     $this->assertEqual($count, 1, 'Found feed_node_item record.');
 
     // Remove all items
@@ -123,17 +123,17 @@
     // Delete and assert all items gone.
     $this->drupalPost('node/'. $nid .'/delete-items', array(), 'Delete');
 
-    $count = db_result(db_query('SELECT COUNT(*) FROM {node} WHERE type = "feed_item"'));
+    $count = db_result(db_query("SELECT COUNT(*) FROM {node} WHERE type = 'feed_item'"));
     $this->assertEqual($count, 0, 'Found the correct number of feed item nodes in database.');
 
-    $count = db_result(db_query('SELECT COUNT(*) FROM {feeds_node_item}'));
+    $count = db_result(db_query("SELECT COUNT(*) FROM {feeds_node_item}"));
     $this->assertEqual($count, 0, 'Found the correct number of records in feeds_node_item.');
 
     // Create a batch of nodes.
     $this->createFeedNodes('feed', 10, 'feed');
-    $count = db_result(db_query('SELECT COUNT(*) from {node} WHERE type = "feed_item"'));
+    $count = db_result(db_query("SELECT COUNT(*) FROM {node} WHERE type = 'feed_item'"));
     $this->assertEqual($count, 100, 'Imported 100 nodes.');
-    $count = db_result(db_query('SELECT COUNT(*) FROM {feeds_node_item}'));
+    $count = db_result(db_query("SELECT COUNT(*) FROM {feeds_node_item}"));
     $this->assertEqual($count, 100, 'Found 100 records in feeds_node_item.');
 
     // Disable the configuration.
@@ -201,22 +201,22 @@
     // Delete and re import.
     $this->drupalPost('node/'. $nid .'/delete-items', array(), 'Delete');
     $this->assertText('Deleted 10 items.');
-    $count = db_result(db_query('SELECT COUNT(*) FROM {feeds_data_feed_fast}'));
+    $count = db_result(db_query("SELECT COUNT(*) FROM {feeds_data_feed_fast}"));
     $this->assertEqual($count, 0, 'Found correct number of items.');
 
     $this->drupalPost('node/'. $nid .'/delete-items', array(), 'Delete');
     $this->assertText('Deleted 0 items.');
-    $count = db_result(db_query('SELECT COUNT(*) FROM {feeds_data_feed_fast}'));
+    $count = db_result(db_query("SELECT COUNT(*) FROM {feeds_data_feed_fast}"));
     $this->assertEqual($count, 0, 'Found correct number of items.');
 
     $this->drupalPost('node/'. $nid .'/import', array(), 'Import');
     $this->assertText('Created 10 items.');
-    $count = db_result(db_query('SELECT COUNT(*) FROM {feeds_data_feed_fast}'));
+    $count = db_result(db_query("SELECT COUNT(*) FROM {feeds_data_feed_fast}"));
     $this->assertEqual($count, 10, 'Found correct number of items.');
 
     $this->drupalPost('node/'. $nid .'/import', array(), 'Import');
     $this->assertText('There are no new items.');
-    $count = db_result(db_query('SELECT COUNT(*) FROM {feeds_data_feed_fast}'));
+    $count = db_result(db_query("SELECT COUNT(*) FROM {feeds_data_feed_fast}"));
     $this->assertEqual($count, 10, 'Found correct number of items.');
 
     // Disable.
@@ -291,12 +291,12 @@
 
     // Assert DB status as is and again after an additional import.
     for ($i = 0; $i < 2; $i++) {
-      $count = db_result(db_query('SELECT COUNT(*) FROM {feeds_node_item}'));
+      $count = db_result(db_query("SELECT COUNT(*) FROM {feeds_node_item}"));
       $this->assertEqual($count, 8, 'Found correct number of items.');
-      $count = db_result(db_query('SELECT COUNT(*) FROM {node} WHERE type = "story" AND status = 1 AND uid = 0'));
+      $count = db_result(db_query("SELECT COUNT(*) FROM {node} WHERE type = 'story' AND status = 1 AND uid = 0"));
       $this->assertEqual($count, 8, 'Found correct number of items.');
       // Do not filter on type intentionally. There shouldn't be more than 8 nodes total.
-      $count = db_result(db_query('SELECT COUNT(*) FROM {node_revisions}'));
+      $count = db_result(db_query("SELECT COUNT(*) FROM {node_revisions}"));
       $this->assertEqual($count, 8, 'Found correct number of items.');
 
       // Import again. Feeds only updates items that haven't changed. However,
@@ -324,12 +324,12 @@
     $this->disable('node');
 
     // Nodes should be still present.
-    $count = db_result(db_query('SELECT COUNT(*) FROM {feeds_node_item}'));
+    $count = db_result(db_query("SELECT COUNT(*) FROM {feeds_node_item}"));
     $this->assertEqual($count, 8, 'Found correct number of items.');
-    $count = db_result(db_query('SELECT COUNT(*) FROM {node} WHERE type = "story" AND status = 1 AND uid = 0'));
+    $count = db_result(db_query("SELECT COUNT(*) FROM {node} WHERE type = 'story' AND status = 1 AND uid = 0"));
     $this->assertEqual($count, 8, 'Found correct number of items.');
     // Do not filter on type intentionally. There shouldn't be more than 8 nodes total.
-    $count = db_result(db_query('SELECT COUNT(*) FROM {node_revisions}'));
+    $count = db_result(db_query("SELECT COUNT(*) FROM {node_revisions}"));
     $this->assertEqual($count, 8, 'Found correct number of items.');
   }
 }
@@ -376,7 +376,7 @@
     $file = $this->generateOPML();
     $this->importFile('opml', $file);
     $this->assertText('Created 3 feed nodes.');
-    $count = db_result(db_query('SELECT COUNT(*) FROM {feeds_source}'));
+    $count = db_result(db_query("SELECT COUNT(*) FROM {feeds_source}"));
     $this->assertEqual($count, 4, 'Found correct number of items.');
 
     // Import a feed and then delete all items from it.
diff -urN feeds.orig/feeds.module feeds/feeds.module
--- feeds.orig/feeds.module	2010-01-25 16:18:28.000000000 +0100
+++ feeds/feeds.module	2010-02-09 23:12:28.000000000 +0100
@@ -306,7 +306,7 @@
 function _feeds_nodeapi_node_processor($node, $op) {
   switch ($op) {
     case 'load':
-      if ($result = db_fetch_object(db_query('SELECT imported, guid, url, feed_nid FROM {feeds_node_item} WHERE nid = %d', $node->nid))) {
+      if ($result = db_fetch_object(db_query("SELECT imported, guid, url, feed_nid FROM {feeds_node_item} WHERE nid = %d", $node->nid))) {
         $node->feeds_node_item = $result;
       }
       break;
@@ -324,7 +324,7 @@
       break;
     case 'delete':
       if (isset($node->feeds_node_item)) {
-        db_query('DELETE FROM {feeds_node_item} WHERE nid = %d', $node->nid);
+        db_query("DELETE FROM {feeds_node_item} WHERE nid = %d", $node->nid);
       }
       break;
   }
diff -urN feeds.orig/includes/FeedsImporter.inc feeds/includes/FeedsImporter.inc
--- feeds.orig/includes/FeedsImporter.inc	2009-12-21 00:48:38.000000000 +0100
+++ feeds/includes/FeedsImporter.inc	2010-02-09 23:12:28.000000000 +0100
@@ -125,7 +125,7 @@
    * from database, does not delete configuration itself.
    */
   public function delete() {
-    db_query('DELETE FROM {feeds_importer} WHERE id = "%s"', $this->id);
+    db_query("DELETE FROM {feeds_importer} WHERE id = '%s'", $this->id);
   }
 
   /**
diff -urN feeds.orig/includes/FeedsScheduler.inc feeds/includes/FeedsScheduler.inc
--- feeds.orig/includes/FeedsScheduler.inc	2009-12-21 00:48:38.000000000 +0100
+++ feeds/includes/FeedsScheduler.inc	2010-02-09 23:12:28.000000000 +0100
@@ -179,7 +179,7 @@
    * Implementation of FeedsSchedulerInterface::remove().
    */
   public function remove($importer_id, $callback, $feed_nid = 0) {
-    db_query('DELETE FROM {feeds_schedule} WHERE id = "%s" AND callback = "%s" AND feed_nid = %d', $importer_id, $callback, $feed_nid);
+    db_query("DELETE FROM {feeds_schedule} WHERE id = '%s' AND callback = '%s' AND feed_nid = %d", $importer_id, $callback, $feed_nid);
   }
 
   /**
diff -urN feeds.orig/includes/FeedsSource.inc feeds/includes/FeedsSource.inc
--- feeds.orig/includes/FeedsSource.inc	2009-12-21 00:48:38.000000000 +0100
+++ feeds/includes/FeedsSource.inc	2010-02-09 23:12:28.000000000 +0100
@@ -164,7 +164,7 @@
    * @todo Patch CTools to move constants from export.inc to ctools.module.
    */
   public function load() {
-    if ($config = db_result(db_query('SELECT config FROM {feeds_source} WHERE id = "%s" AND feed_nid = %d', $this->id, $this->feed_nid))) {
+    if ($config = db_result(db_query("SELECT config FROM {feeds_source} WHERE id = '%s' AND feed_nid = %d", $this->id, $this->feed_nid))) {
       // While FeedsSource cannot be exported, we still use CTool's export.inc
       // export definitions.
       ctools_include('export');
@@ -178,7 +178,7 @@
    * from database, does not delete configuration itself.
    */
   public function delete() {
-    db_query('DELETE FROM {feeds_source} WHERE id = "%s" AND feed_nid = %d', $this->id, $this->feed_nid);
+    db_query("DELETE FROM {feeds_source} WHERE id = '%s' AND feed_nid = %d", $this->id, $this->feed_nid);
   }
 
   /**
diff -urN feeds.orig/plugins/FeedsFeedNodeProcessor.inc feeds/plugins/FeedsFeedNodeProcessor.inc
--- feeds.orig/plugins/FeedsFeedNodeProcessor.inc	2009-12-21 00:48:38.000000000 +0100
+++ feeds/plugins/FeedsFeedNodeProcessor.inc	2010-02-09 23:12:28.000000000 +0100
@@ -32,7 +32,7 @@
         // If updating populate nid and vid avoiding an expensive node_load().
         if (!empty($nid)) {
           $node->nid = $nid;
-          $node->vid = db_result(db_query('SELECT vid FROM {node} WHERE nid = %d', $nid));
+          $node->vid = db_result(db_query("SELECT vid FROM {node} WHERE nid = %d", $nid));
         }
 
         // Save the node.
@@ -205,7 +205,7 @@
     // We only support one unique target: source
     foreach ($this->uniqueTargets($source_item) as $target => $value) {
       if ($target == 'source') {
-        return db_result(db_query('SELECT fs.feed_nid FROM {node} n JOIN {feeds_source} fs ON n.nid = fs.feed_nid WHERE fs.id = "%s" AND fs.source = "%s"', $this->feedNodeImporter()->id, $value));
+        return db_result(db_query("SELECT fs.feed_nid FROM {node} n JOIN {feeds_source} fs ON n.nid = fs.feed_nid WHERE fs.id = '%s' AND fs.source = '%s'", $this->feedNodeImporter()->id, $value));
       }
     }
     return 0;
diff -urN feeds.orig/plugins/FeedsNodeProcessor.inc feeds/plugins/FeedsNodeProcessor.inc
--- feeds.orig/plugins/FeedsNodeProcessor.inc	2009-12-21 02:20:05.000000000 +0100
+++ feeds/plugins/FeedsNodeProcessor.inc	2010-02-09 23:12:28.000000000 +0100
@@ -37,7 +37,7 @@
 
           // If updating populate nid and vid avoiding an expensive node_load().
           $node->nid = $nid;
-          $node->vid = db_result(db_query('SELECT vid FROM {node} WHERE nid = %d', $nid));
+          $node->vid = db_result(db_query("SELECT vid FROM {node} WHERE nid = %d", $nid));
           $updated++;
         }
         else {
@@ -89,7 +89,7 @@
     // Count number of deleted nodes.
     $deleted = 0;
 
-    $result = db_query('SELECT nid FROM {feeds_node_item} WHERE feed_nid = %d', $source->feed_nid);
+    $result = db_query("SELECT nid FROM {feeds_node_item} WHERE feed_nid = %d", $source->feed_nid);
     while ($node = db_fetch_object($result)) {
       _feeds_node_delete($node->nid);
       $deleted++;
@@ -119,7 +119,7 @@
     // Create a way of letting the caller know whether all nodes could be
     // deleted. Has to be thought through in a larger context of batch
     // processing support for import and expiry.
-    $result = db_query('SELECT n.nid FROM {node} n JOIN {feeds_node_item} fni ON n.nid = fni.nid WHERE fni.id = "%s" AND n.created < %d', $this->id, FEEDS_REQUEST_TIME - $time, 0, 50);
+    $result = db_query("SELECT n.nid FROM {node} n JOIN {feeds_node_item} fni ON n.nid = fni.nid WHERE fni.id = '%s' AND n.created < %d", $this->id, FEEDS_REQUEST_TIME - $time, 0, 50);
     while ($node = db_fetch_object($result)) {
       _feeds_node_delete($node->nid);
     }
@@ -259,10 +259,10 @@
     foreach ($this->uniqueTargets($source_item) as $target => $value) {
       switch ($target) {
         case 'url':
-          $nid = db_result(db_query('SELECT nid FROM {feeds_node_item} WHERE feed_nid = %d AND url = "%s"', $source->feed_nid, $value));
+          $nid = db_result(db_query("SELECT nid FROM {feeds_node_item} WHERE feed_nid = %d AND url = '%s'", $source->feed_nid, $value));
           break;
         case 'guid':
-          $nid = db_result(db_query('SELECT nid FROM {feeds_node_item} WHERE feed_nid = %d AND guid = "%s"', $source->feed_nid, $value));
+          $nid = db_result(db_query("SELECT nid FROM {feeds_node_item} WHERE feed_nid = %d AND guid = '%s'", $source->feed_nid, $value));
           break;
       }
       if ($nid) {
@@ -308,7 +308,7 @@
    * @return Empty string if no item is found, hash otherwise.
    */
   protected function getHash($nid) {
-    $hash = db_result(db_query('SELECT hash FROM {feeds_node_item} WHERE nid = %d', $nid));
+    $hash = db_result(db_query("SELECT hash FROM {feeds_node_item} WHERE nid = %d", $nid));
     if ($hash) {
       // Return with the hash.
       return $hash;
@@ -326,8 +326,8 @@
 
   $node = node_load($nid);
 
-  db_query('DELETE FROM {node} WHERE nid = %d', $node->nid);
-  db_query('DELETE FROM {node_revisions} WHERE nid = %d', $node->nid);
+  db_query("DELETE FROM {node} WHERE nid = %d", $node->nid);
+  db_query("DELETE FROM {node_revisions} WHERE nid = %d", $node->nid);
 
   // Call the node-specific callback (if any):
   node_invoke($node, 'delete');
diff -urN feeds.orig/plugins/FeedsTermProcessor.inc feeds/plugins/FeedsTermProcessor.inc
--- feeds.orig/plugins/FeedsTermProcessor.inc	2009-12-21 00:27:28.000000000 +0100
+++ feeds/plugins/FeedsTermProcessor.inc	2010-02-09 23:12:28.000000000 +0100
@@ -81,7 +81,7 @@
   public function clear(FeedsSource $source) {
     $deleted = 0;
 
-    $result = db_query('SELECT tid FROM {term_data} WHERE vid = %d', $this->config['vocabulary']);
+    $result = db_query("SELECT tid FROM {term_data} WHERE vid = %d", $this->config["vocabulary"]);
     while ($term = db_fetch_object($result)) {
       if (taxonomy_del_term($term->tid) == SAVED_DELETED) {
         $deleted++;
@@ -171,7 +171,7 @@
     // The only possible unique target is name.
     foreach ($this->uniqueTargets($source_item) as $target => $value) {
       if ($target == 'name') {
-        if ($tid = db_result(db_query('SELECT tid FROM {term_data} WHERE name = "%s" AND vid = %d', $value, $this->config['vocabulary']))) {
+        if ($tid = db_result(db_query("SELECT tid FROM {term_data} WHERE name = '%s' AND vid = %d", $value, $this->config["vocabulary"]))) {
           return $tid;
         }
       }
diff -urN feeds.orig/plugins/FeedsUserProcessor.inc feeds/plugins/FeedsUserProcessor.inc
--- feeds.orig/plugins/FeedsUserProcessor.inc	2009-12-21 00:48:38.000000000 +0100
+++ feeds/plugins/FeedsUserProcessor.inc	2010-02-09 23:12:28.000000000 +0100
@@ -179,10 +179,10 @@
     foreach ($this->uniqueTargets($source_item) as $target => $value) {
       switch ($target) {
         case 'name':
-          $nid = db_result(db_query('SELECT uid FROM {users} WHERE name = "%s"', $value));
+          $nid = db_result(db_query("SELECT uid FROM {users} WHERE name = '%s'", $value));
           break;
         case 'mail':
-          $nid = db_result(db_query('SELECT uid FROM {users} WHERE mail = "%s"', $value));
+          $nid = db_result(db_query("SELECT uid FROM {users} WHERE mail = '%s'", $value));
           break;
       }
       if ($nid) {
diff -urN feeds.orig/tests/feeds_mapper_taxonomy.test feeds/tests/feeds_mapper_taxonomy.test
--- feeds.orig/tests/feeds_mapper_taxonomy.test	2009-12-05 02:38:27.000000000 +0100
+++ feeds/tests/feeds_mapper_taxonomy.test	2010-02-09 23:12:28.000000000 +0100
@@ -94,8 +94,8 @@
     // Assert 10 items aggregated after creation of the node.
     $this->assertText('Created 10 Story nodes.');
     // There should be 30 terms and 44 term-node relations.
-    $this->assertEqual(30, db_result(db_query('SELECT count(*) FROM {term_data}')), 'Found correct number of terms.');
-    $this->assertEqual(44, db_result(db_query('SELECT count(*) FROM {term_node}')), 'Found correct number of term-node relations.');
+    $this->assertEqual(30, db_result(db_query("SELECT count(*) FROM {term_data}")), "Found correct number of terms.");
+    $this->assertEqual(44, db_result(db_query("SELECT count(*) FROM {term_node}")), "Found correct number of term-node relations.");
 
     // Take a look at the actual terms on frontpage.
     $this->drupalGet('node');
@@ -139,8 +139,8 @@
     // Delete all items, all associations are gone.
     $this->drupalPost('node/'. $nid .'/delete-items', array(), 'Delete');
     $this->assertText('Deleted 10 nodes.');
-    $this->assertEqual(30, db_result(db_query('SELECT count(*) FROM {term_data}')), 'Found correct number of terms.');
-    $this->assertEqual(0, db_result(db_query('SELECT count(*) FROM {term_node}')), 'Found correct number of term-node relations.');
+    $this->assertEqual(30, db_result(db_query("SELECT count(*) FROM {term_data}")), "Found correct number of terms.");
+    $this->assertEqual(0, db_result(db_query("SELECT count(*) FROM {term_node}")), "Found correct number of term-node relations.");
 
     // Remove "Tag" setting, import again.
     $edit = array(
@@ -151,8 +151,8 @@
     $this->assertText('Created 10 Story nodes.');
 
     // We should only get one term-node association per node.
-    $this->assertEqual(30, db_result(db_query('SELECT count(*) FROM {term_data}')), 'Found correct number of terms.');
-    $this->assertEqual(10, db_result(db_query('SELECT count(*) FROM {term_node}')), 'Found correct number of term-node relations.');
+    $this->assertEqual(30, db_result(db_query("SELECT count(*) FROM {term_data}")), "Found correct number of terms.");
+    $this->assertEqual(10, db_result(db_query("SELECT count(*) FROM {term_node}")), "Found correct number of term-node relations.");
 
     // Delete all items.
     $this->drupalPost('node/'. $nid .'/delete-items', array(), 'Delete');
@@ -166,8 +166,8 @@
     $this->assertText('Created 10 Story nodes.');
 
     // We should get all term-node associations again.
-    $this->assertEqual(30, db_result(db_query('SELECT count(*) FROM {term_data}')), 'Found correct number of terms.');
-    $this->assertEqual(44, db_result(db_query('SELECT count(*) FROM {term_node}')), 'Found correct number of term-node relations.');
+    $this->assertEqual(30, db_result(db_query("SELECT count(*) FROM {term_data}")), "Found correct number of terms.");
+    $this->assertEqual(44, db_result(db_query("SELECT count(*) FROM {term_node}")), "Found correct number of term-node relations.");
 
     // Delete all items.
     $this->drupalPost('node/'. $nid .'/delete-items', array(), 'Delete');
@@ -180,7 +180,7 @@
     $this->assertText('Created 10 Story nodes.');
 
     // This term should now be missing from term-node associations.
-    $this->assertEqual(29, db_result(db_query('SELECT count(*) FROM {term_data}')), 'Found correct number of terms.');
-    $this->assertEqual(39, db_result(db_query('SELECT count(*) FROM {term_node}')), 'Found correct number of term-node relations.'. db_result(db_query('SELECT count(*) FROM {term_node}')));
+    $this->assertEqual(29, db_result(db_query("SELECT count(*) FROM {term_data}")), "Found correct number of terms.");
+    $this->assertEqual(39, db_result(db_query("SELECT count(*) FROM {term_node}")), "Found correct number of term-node relations.". db_result(db_query("SELECT count(*) FROM {term_node}")));
   }
 }
diff -urN feeds.orig/tests/feeds.test feeds/tests/feeds.test
--- feeds.orig/tests/feeds.test	2010-01-18 20:20:40.000000000 +0100
+++ feeds/tests/feeds.test	2010-02-09 23:12:28.000000000 +0100
@@ -90,7 +90,7 @@
     $this->drupalGet('node/'. $story_nid);
     $this->assertNoRaw('node/'. $story_nid .'/import');
     $this->assertNoRaw('node/'. $story_nid .'/delete-items');
-    $this->assertEqual('Created/updated by FeedsNodeProcessor', db_result(db_query('SELECT nr.log FROM {node} n JOIN {node_revisions} nr ON n.vid = nr.vid WHERE n.nid = %d', $story_nid)));
+    $this->assertEqual("Created/updated by FeedsNodeProcessor", db_result(db_query("SELECT nr.log FROM {node} n JOIN {node_revisions} nr ON n.vid = nr.vid WHERE n.nid = %d", $story_nid)));
 
     // Assert accuracy of aggregated information.
     $this->drupalGet('node');
@@ -126,7 +126,7 @@
     $this->assertText('The first major change is switching');
 
     // Assert DB status.
-    $count = db_result(db_query('SELECT COUNT(*) FROM {feeds_node_item}'));
+    $count = db_result(db_query("SELECT COUNT(*) FROM {feeds_node_item}"));
     $this->assertEqual($count, 10, 'Accurate number of items in database.');
 
     // Import again.
@@ -134,7 +134,7 @@
     $this->assertText('There is no new content.');
 
     // Assert DB status, there still shouldn't be more than 10 items.
-    $count = db_result(db_query('SELECT COUNT(*) FROM {feeds_node_item}'));
+    $count = db_result(db_query("SELECT COUNT(*) FROM {feeds_node_item}"));
     $this->assertEqual($count, 10, 'Accurate number of items in database.');
 
     // Enable update existing and import updated feed file.
@@ -155,7 +155,7 @@
     $this->assertText('There is no new content.');
 
     // Assert DB status, there still shouldn't be more than 10 items.
-    $count = db_result(db_query('SELECT COUNT(*) FROM {feeds_node_item}'));
+    $count = db_result(db_query("SELECT COUNT(*) FROM {feeds_node_item}"));
     $this->assertEqual($count, 10, 'Accurate number of items in database.');
 
     // Now delete all items.
@@ -163,7 +163,7 @@
     $this->assertText('Deleted 10 nodes.');
 
     // Assert DB status, now there should be no items.
-    $count = db_result(db_query('SELECT COUNT(*) FROM {feeds_node_item}'));
+    $count = db_result(db_query("SELECT COUNT(*) FROM {feeds_node_item}"));
     $this->assertEqual($count, 0, 'Accurate number of items in database.');
 
     // Import again, we should find new content.
@@ -171,7 +171,7 @@
     $this->assertText('Created 10 Story nodes.');
 
     // Assert DB status, there should be 10 again.
-    $count = db_result(db_query('SELECT COUNT(*) FROM {feeds_node_item}'));
+    $count = db_result(db_query("SELECT COUNT(*) FROM {feeds_node_item}"));
     $this->assertEqual($count, 10, 'Accurate number of items in database.');
 
     // Login with new user with only access content permissions.
@@ -267,7 +267,7 @@
     $this->assertText('The first major change is switching');
 
     // Assert DB status.
-    $count = db_result(db_query('SELECT COUNT(*) FROM {feeds_node_item}'));
+    $count = db_result(db_query("SELECT COUNT(*) FROM {feeds_node_item}"));
     $this->assertEqual($count, 10, 'Accurate number of items in database.');
 
     // Import again.
@@ -275,7 +275,7 @@
     $this->assertText('There is no new content.');
 
     // Assert DB status, there still shouldn't be more than 10 items.
-    $count = db_result(db_query('SELECT COUNT(*) FROM {feeds_node_item}'));
+    $count = db_result(db_query("SELECT COUNT(*) FROM {feeds_node_item}"));
     $this->assertEqual($count, 10, 'Accurate number of items in database.');
 
     // Enable update existing and import updated feed file.
@@ -295,7 +295,7 @@
     $this->assertText('There is no new content.');
 
     // Assert DB status, there still shouldn't be more than 10 items.
-    $count = db_result(db_query('SELECT COUNT(*) FROM {feeds_node_item}'));
+    $count = db_result(db_query("SELECT COUNT(*) FROM {feeds_node_item}"));
     $this->assertEqual($count, 10, 'Accurate number of items in database.');
 
     // Now delete all items.
@@ -303,7 +303,7 @@
     $this->assertText('Deleted 10 nodes.');
 
     // Assert DB status, now there should be no items.
-    $count = db_result(db_query('SELECT COUNT(*) FROM {feeds_node_item}'));
+    $count = db_result(db_query("SELECT COUNT(*) FROM {feeds_node_item}"));
     $this->assertEqual($count, 0, 'Accurate number of items in database.');
 
     // Import again, we should find new content.
@@ -311,7 +311,7 @@
     $this->assertText('Created 10 Story nodes.');
 
     // Assert DB status, there should be 10 again.
-    $count = db_result(db_query('SELECT COUNT(*) FROM {feeds_node_item}'));
+    $count = db_result(db_query("SELECT COUNT(*) FROM {feeds_node_item}"));
     $this->assertEqual($count, 10, 'Accurate number of items in database.');
 
     // Login with new user with only access content permissions.
@@ -400,7 +400,7 @@
     $this->addMappings('rss', $mappings);
 
     // Verify the mapping configuration.
-    $config = unserialize(db_result(db_query('SELECT config FROM {feeds_importer} WHERE id = "rss"')));
+    $config = unserialize(db_result(db_query("SELECT config FROM {feeds_importer} WHERE id = 'rss'")));
     $stored_mappings = $config['processor']['config']['mappings'];
     foreach ($mappings as $i => $mapping) {
       $this->assertEqual($mapping['source'], $stored_mappings[$i]['source']);
@@ -451,7 +451,7 @@
     $this->assertText('The first major change is switching');
 
     // Assert DB status.
-    $count = db_result(db_query('SELECT COUNT(*) FROM {feeds_data_rss}'));
+    $count = db_result(db_query("SELECT COUNT(*) FROM {feeds_data_rss}"));
     $this->assertEqual($count, 10, 'Accurate number of items in database.');
 
     // Import again.
@@ -459,7 +459,7 @@
     $this->assertText('There are no new items.');
 
     // Assert DB status, there still shouldn't be more than 10 items.
-    $count = db_result(db_query('SELECT COUNT(*) FROM {feeds_data_rss}'));
+    $count = db_result(db_query("SELECT COUNT(*) FROM {feeds_data_rss}"));
     $this->assertEqual($count, 10, 'Accurate number of items in database.');
 
     // Now delete all items.
@@ -467,7 +467,7 @@
     $this->assertText('Deleted 10 items.');
 
     // Assert DB status, now there should be no items.
-    $count = db_result(db_query('SELECT COUNT(*) FROM {feeds_data_rss}'));
+    $count = db_result(db_query("SELECT COUNT(*) FROM {feeds_data_rss}"));
     $this->assertEqual($count, 0, 'Accurate number of items in database.');
 
     // Import again, we should find new content.
@@ -475,7 +475,7 @@
     $this->assertText('Created 10 items.');
 
     // Assert DB status, there should be 10 again.
-    $count = db_result(db_query('SELECT COUNT(*) FROM {feeds_data_rss}'));
+    $count = db_result(db_query("SELECT COUNT(*) FROM {feeds_data_rss}"));
     $this->assertEqual($count, 10, 'Accurate number of items in database.');
 
     // @todo Standalone import form testing.
@@ -656,11 +656,11 @@
 
     // There should be feeds_schedule_num (= 10) feeds updated now.
     $schedule = array();
-    $count = db_result(db_query('select COUNT(*) from {feeds_schedule} WHERE last_scheduled_time <> 0'));
+    $count = db_result(db_query("SELECT COUNT(*) FROM {feeds_schedule} WHERE last_scheduled_time <> 0"));
     $this->assertEqual($count, 10, '10 feeds refreshed on cron.');
 
     // There should be 100 story nodes in the database.
-    $count = db_result(db_query('SELECT COUNT(*) FROM {node} WHERE type = "story"'));
+    $count = db_result(db_query("SELECT COUNT(*) FROM {node} WHERE type = 'story'"));
     $this->assertEqual($count, 100, 'There are 100 story nodes aggregated.');
 
     // Hit twice cron again.
@@ -669,19 +669,19 @@
 
     // There should be feeds_schedule_num X 2 (= 20) feeds updated now.
     $schedule = array();
-    $result = db_query('select feed_nid, last_scheduled_time, scheduled from {feeds_schedule} WHERE last_scheduled_time <> 0');
+    $result = db_query("SELECT feed_nid, last_scheduled_time, scheduled FROM {feeds_schedule} WHERE last_scheduled_time <> 0");
     while ($row = db_fetch_object($result)) {
       $schedule[$row->feed_nid] = $row;
     }
     $this->assertEqual(count($schedule), 20, '20 feeds refreshed on cron.');
 
     // There should be 200 story nodes in the database.
-    $count = db_result(db_query('SELECT COUNT(*) FROM {node} WHERE type = "story" AND status = 1'));
+    $count = db_result(db_query("SELECT COUNT(*) FROM {node} WHERE type = 'story' AND status = 1"));
     $this->assertEqual($count, 200, 'There are 200 story nodes aggregated.');
 
     // There shouldn't be any items with scheduled = 1 now, if so, this would
     // mean they are stuck.
-    $count = db_result(db_query('SELECT COUNT(*) FROM {feeds_schedule} WHERE scheduled = 1'));
+    $count = db_result(db_query("SELECT COUNT(*) FROM {feeds_schedule} WHERE scheduled = 1"));
     $this->assertEqual($count, 0, 'All items are unscheduled (schedule flag = 0).');
 
     // Hit cron again twice.
@@ -691,7 +691,7 @@
     // The import_period setting of the feed configuration is 1800, there
     // shouldn't be any change to the database now.
     $equal = TRUE;
-    $result = db_query('select feed_nid, last_scheduled_time, scheduled from {feeds_schedule} WHERE last_scheduled_time <> 0');
+    $result = db_query("SELECT feed_nid, last_scheduled_time, scheduled FROM {feeds_schedule} WHERE last_scheduled_time <> 0");
     while ($row = db_fetch_object($result)) {
       $equal = $equal && ($row->last_scheduled_time == $schedule[$row->feed_nid]->last_scheduled_time);
     }
@@ -722,14 +722,14 @@
     // There should not be more nodes than before.
     $equal = FALSE;
     $output = '';
-    $result = db_query('select feed_nid, last_scheduled_time, scheduled from {feeds_schedule} WHERE last_scheduled_time <> 0');
+    $result = db_query("SELECT feed_nid, last_scheduled_time, scheduled FROM {feeds_schedule} WHERE last_scheduled_time <> 0");
     while ($row = db_fetch_object($result)) {
       $equal = $equal || ($row->last_scheduled_time == $schedule[$row->feed_nid]->last_scheduled_time);
     }
     $this->assertFalse($equal, 'Every feed schedule time changed.');
 
     // There should be 200 story nodes in the database.
-    $count = db_result(db_query('SELECT COUNT(*) FROM {node} WHERE type = "story" AND status = 1'));
+    $count = db_result(db_query("SELECT COUNT(*) FROM {node} WHERE type = 'story' AND status = 1"));
     $this->assertEqual($count, 200, 'The total of 200 story nodes has not changed.');
 
     // @todo Use debug time feature in FeedsScheduler and test behavior in future.
diff -urN feeds.orig/tests/feeds.test.inc feeds/tests/feeds.test.inc
--- feeds.orig/tests/feeds.test.inc	2009-12-21 00:48:38.000000000 +0100
+++ feeds/tests/feeds.test.inc	2010-02-09 23:12:28.000000000 +0100
@@ -117,7 +117,7 @@
       $this->drupalPost("admin/build/feeds/edit/$id/$type", $edit, 'Save');
 
       // Assert actual configuration.
-      $config = unserialize(db_result(db_query('SELECT config FROM {feeds_importer} WHERE id = "%s"', $id)));
+      $config = unserialize(db_result(db_query("SELECT config FROM {feeds_importer} WHERE id = '%s'", $id)));
       $this->assertEqual($config[$type]['plugin_key'], $plugin_key, 'Verified correct '. $type .' ('. $plugin_key .').');
     }
   }
@@ -155,7 +155,7 @@
     }
     // If content type not given, retrieve it.
     if (!$content_type) {
-      $config = unserialize(db_result(db_query('SELECT config FROM {feeds_importer} WHERE id = "%s"', $id)));
+      $config = unserialize(db_result(db_query("SELECT config FROM {feeds_importer} WHERE id = '%s'", $id)));
       $content_type = $config['content_type'];
       $this->assertFalse(empty($content_type), 'Valid content type found: '. $content_type);
     }
@@ -176,15 +176,15 @@
     $this->assertTrue(is_numeric($nid), 'Found node id ('. $nid .').');
 
     // Check whether feed got recorded in feeds_source table.
-    $this->assertEqual(1, db_result(db_query('select COUNT(*) from {feeds_source} WHERE id = "%s" AND feed_nid = %d', $id, $nid)));
-    $source = db_fetch_object(db_query('select * from {feeds_source} WHERE id = "%s" AND feed_nid = %d', $id, $nid));
+    $this->assertEqual(1, db_result(db_query("SELECT COUNT(*) FROM {feeds_source} WHERE id = '%s' AND feed_nid = %d", $id, $nid)));
+    $source = db_fetch_object(db_query("SELECT * FROM {feeds_source} WHERE id = '%s' AND feed_nid = %d", $id, $nid));
     $config = unserialize($source->config);
     $this->assertEqual($config['FeedsHTTPFetcher']['source'], $feed_url, t('URL in DB correct.'));
 
     // Check whether feed got properly added to scheduler.
-    $this->assertEqual(1, db_result(db_query('SELECT COUNT(*) FROM {feeds_schedule} WHERE id = "%s" AND feed_nid = %d AND callback = "import" AND last_scheduled_time = 0 AND scheduled = 0', $id, $nid)));
+    $this->assertEqual(1, db_result(db_query("SELECT COUNT(*) FROM {feeds_schedule} WHERE id = '%s' AND feed_nid = %d AND callback = 'import' AND last_scheduled_time = 0 AND scheduled = 0", $id, $nid)));
     // There must be only one entry for 'expire' - no matter how many actual feed nodes exist.
-    $this->assertEqual(1, db_result(db_query('SELECT COUNT(*) FROM {feeds_schedule} WHERE id = "%s" AND callback = "expire" AND last_scheduled_time = 0 AND scheduled = 0', $id)));
+    $this->assertEqual(1, db_result(db_query("SELECT COUNT(*) FROM {feeds_schedule} WHERE id = '%s' AND callback = 'expire' AND last_scheduled_time = 0 AND scheduled = 0", $id)));
 
     return $nid;
   }
@@ -209,7 +209,7 @@
     $this->assertText('has been updated.');
 
     // Check that the URL was updated in the feeds_source table.
-    $source = db_fetch_object(db_query('select * from {feeds_source} WHERE feed_nid = %d', $nid));
+    $source = db_fetch_object(db_query("SELECT * FROM {feeds_source} WHERE feed_nid = %d", $nid));
     $config = unserialize($source->config);
     $this->assertEqual($config['FeedsHTTPFetcher']['source'], $feed_url, t('URL in DB correct.'));
   }
@@ -242,15 +242,15 @@
     $nid = $this->drupalPost('import/'. $id, $edit, 'Import');
 
     // Check whether feed got recorded in feeds_source table.
-    $this->assertEqual(1, db_result(db_query('SELECT COUNT(*) FROM {feeds_source} WHERE id = "%s" AND feed_nid = 0', $id)));
-    $source = db_fetch_object(db_query('SELECT * FROM {feeds_source} WHERE id = "%s" AND feed_nid = 0', $id));
+    $this->assertEqual(1, db_result(db_query("SELECT COUNT(*) FROM {feeds_source} WHERE id = '%s' AND feed_nid = 0", $id)));
+    $source = db_fetch_object(db_query("SELECT * FROM {feeds_source} WHERE id = '%s' AND feed_nid = 0", $id));
     $config = unserialize($source->config);
     $this->assertEqual($config['FeedsHTTPFetcher']['source'], $feed_url, t('URL in DB correct.'));
 
     // Check whether feed got properly added to scheduler.
-    $this->assertEqual(1, db_result(db_query('SELECT COUNT(*) FROM {feeds_schedule} WHERE id = "%s" AND feed_nid = 0 AND callback = "import" AND last_scheduled_time = 0 AND scheduled = 0', $id)));
+    $this->assertEqual(1, db_result(db_query("SELECT COUNT(*) FROM {feeds_schedule} WHERE id = '%s' AND feed_nid = 0 AND callback = 'import' AND last_scheduled_time = 0 AND scheduled = 0", $id)));
     // There must be only one entry for callback 'expire' - no matter what the feed_nid is.
-    $this->assertEqual(1, db_result(db_query('SELECT COUNT(*) FROM {feeds_schedule} WHERE id = "%s" AND callback = "expire" AND last_scheduled_time = 0 AND scheduled = 0', $id)));
+    $this->assertEqual(1, db_result(db_query("SELECT COUNT(*) FROM {feeds_schedule} WHERE id = '%s' AND callback = 'expire' AND last_scheduled_time = 0 AND scheduled = 0", $id)));
   }
 
   /**
@@ -275,7 +275,7 @@
    */
   public function assertPlugins($id, $fetcher, $parser, $processor) {
     // Assert actual configuration.
-    $config = unserialize(db_result(db_query('SELECT config FROM {feeds_importer} WHERE id = "%s"', $id)));
+    $config = unserialize(db_result(db_query("SELECT config FROM {feeds_importer} WHERE id = '%s'", $id)));
 
     $this->assertEqual($config['fetcher']['plugin_key'], $fetcher, 'Correct fetcher');
     $this->assertEqual($config['parser']['plugin_key'], $parser, 'Correct parser');