--- tests/feeds.test.inc	2009-10-23 22:38:20.000000000 +0000
+++ /var/www/localhost/feeds.20091124/tests/feeds.test.inc	2009-11-23 15:36:19.000000000 +0000
@@ -117,7 +117,7 @@ class FeedsWebTestCase extends DrupalWeb
       $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 .').');
     }
   }
@@ -140,7 +140,7 @@ class FeedsWebTestCase extends DrupalWeb
     }
     // 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);
     }
@@ -161,15 +161,15 @@ class FeedsWebTestCase extends DrupalWeb
     $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 actuall 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;
   }
@@ -202,15 +202,15 @@ class FeedsWebTestCase extends DrupalWeb
     $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)));
   }
 
   /**
@@ -236,7 +236,7 @@ class FeedsWebTestCase extends DrupalWeb
    */
   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');
@@ -274,4 +274,4 @@ class FeedsWebTestCase extends DrupalWeb
       }
     }
   }
-}
\ No newline at end of file
+}