diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 19f139842806c72310f0d4793c227e99dfe97899..3b9d0cb5584373d4277d215552da9f3620b087b1 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -4,6 +4,7 @@
Feeds 6.x 1.0 xxxxx xx, 2010-xx-xx
----------------------------------
+- #622932 pounard: Fix non-standard SQL (PostgreSQL compatibility)
- #705872 Scott Reynolds: Added HTTPFetcher autodiscovery
- #740962 alex_b: Fix FileFetcher Attached to Feed Node, Upload Field Not Saving File
Path.
diff --git a/feeds.module b/feeds.module
index e4257e060517fbdab7389c71ab95b5b3f8e96809..3d91cad2293b7550c632ff4ed9b921800409d14c 100644
--- a/feeds.module
+++ b/feeds.module
@@ -324,7 +324,7 @@ function feeds_nodeapi(&$node, $op, $form) {
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;
@@ -342,7 +342,7 @@ function _feeds_nodeapi_node_processor($node, $op) {
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 --git a/feeds_defaults/tests/feeds_defaults.test b/feeds_defaults/tests/feeds_defaults.test
index be740a16685cd891abfe11c948a251e854418def..4b3106f4e379ddf25a6d6fb60cf7303c052eb8cb 100644
--- a/feeds_defaults/tests/feeds_defaults.test
+++ b/feeds_defaults/tests/feeds_defaults.test
@@ -88,28 +88,28 @@ class FeedsDefaultsFeedTestCase extends FeedsDefaultsTestCase {
$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 @@ class FeedsDefaultsFeedTestCase extends FeedsDefaultsTestCase {
// 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 @@ class FeedsDefaultsFastFeedTestCase extends FeedsDefaultsTestCase {
// 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 @@ class FeedsDefaultsNodeTestCase extends FeedsDefaultsTestCase {
// 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,
@@ -336,12 +336,12 @@ class FeedsDefaultsNodeTestCase extends FeedsDefaultsTestCase {
$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, 79, '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, 79, '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, 79, 'Found correct number of items.');
}
}
@@ -388,7 +388,7 @@ class FeedsDefaultsOPMLTestCase extends FeedsDefaultsTestCase {
$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 --git a/includes/FeedsImporter.inc b/includes/FeedsImporter.inc
index 2b0c2601d6e2e7fb9325bde27301681653c7788f..2e06e40e9c46268994d1e9d30753004ea9665df7 100644
--- a/includes/FeedsImporter.inc
+++ b/includes/FeedsImporter.inc
@@ -164,7 +164,7 @@ class FeedsImporter extends FeedsConfigurable {
* 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 --git a/includes/FeedsScheduler.inc b/includes/FeedsScheduler.inc
index 8517753069633e5f541f2b938d3f1b8a4681ae39..fb9e1cf0743b6f37e4b866771608bc688b8021c9 100644
--- a/includes/FeedsScheduler.inc
+++ b/includes/FeedsScheduler.inc
@@ -97,7 +97,7 @@ class FeedsScheduler implements FeedsSchedulerInterface {
$start = time();
// Release schedule lock where the lock is older than 1 hour.
- db_query('UPDATE {feeds_schedule} SET scheduled = 0 WHERE scheduled < %d', FEEDS_REQUEST_TIME - 3600);
+ db_query("UPDATE {feeds_schedule} SET scheduled = 0 WHERE scheduled < %d", FEEDS_REQUEST_TIME - 3600);
// Iterate over feed importers, pick $num jobs for each of them and
// schedule them.
@@ -147,7 +147,7 @@ class FeedsScheduler implements FeedsSchedulerInterface {
* 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 --git a/includes/FeedsSource.inc b/includes/FeedsSource.inc
index fe0760e1f40edf2516e72cc6fd2147dc0b19f6e2..a5ee9449863a31423f9dec9aa4606b159c7d2859 100644
--- a/includes/FeedsSource.inc
+++ b/includes/FeedsSource.inc
@@ -211,7 +211,7 @@ class FeedsSource extends FeedsConfigurable {
* @todo Patch CTools to move constants from export.inc to ctools.module.
*/
public function load() {
- if ($record = db_fetch_object(db_query('SELECT config, batch FROM {feeds_source} WHERE id = "%s" AND feed_nid = %d', $this->id, $this->feed_nid))) {
+ if ($record = db_fetch_object(db_query("SELECT config, batch 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');
@@ -231,7 +231,7 @@ class FeedsSource extends FeedsConfigurable {
foreach ($this->importer->plugin_types as $type) {
$this->importer->$type->sourceDelete($this);
}
- 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 --git a/plugins/FeedsFeedNodeProcessor.inc b/plugins/FeedsFeedNodeProcessor.inc
index d03133346552ef6ea3a1a1cf6a45253acd82d82d..32b441e199a42bcd035e13010c023e4757829afd 100644
--- a/plugins/FeedsFeedNodeProcessor.inc
+++ b/plugins/FeedsFeedNodeProcessor.inc
@@ -28,7 +28,7 @@ class FeedsFeedNodeProcessor extends FeedsProcessor {
// 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.
@@ -203,7 +203,7 @@ class FeedsFeedNodeProcessor extends FeedsProcessor {
// 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 --git a/plugins/FeedsNodeProcessor.inc b/plugins/FeedsNodeProcessor.inc
index af85296b05eb6aa82709339a43faa3450a1619b2..5c5bc0892060b40c63270eb2c40d42c707a9c83b 100644
--- a/plugins/FeedsNodeProcessor.inc
+++ b/plugins/FeedsNodeProcessor.inc
@@ -40,7 +40,7 @@ class FeedsNodeProcessor extends FeedsProcessor {
// 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));
$batch->updated++;
}
else {
@@ -98,7 +98,7 @@ class FeedsNodeProcessor extends FeedsProcessor {
*/
public function clear(FeedsBatch $batch, FeedsSource $source) {
if (empty($batch->total)) {
- $batch->total = db_result(db_query('SELECT COUNT(nid) FROM {feeds_node_item} WHERE id = "%s" AND feed_nid = %d', $source->id, $source->feed_nid));
+ $batch->total = db_result(db_query("SELECT COUNT(nid) FROM {feeds_node_item} WHERE id = '%s' AND feed_nid = %d", $source->id, $source->feed_nid));
}
$result = db_query_range('SELECT nid FROM {feeds_node_item} WHERE id = "%s" AND feed_nid = %d ', $source->id, $source->feed_nid, 0, variable_get('feeds_node_batch_size', FEEDS_NODE_BATCH_SIZE));
while ($node = db_fetch_object($result)) {
@@ -274,10 +274,10 @@ class FeedsNodeProcessor extends FeedsProcessor {
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 id = "%s" AND url = "%s"', $source->feed_nid, $source->id, $value));
+ $nid = db_result(db_query("SELECT nid FROM {feeds_node_item} WHERE feed_nid = %d AND id = '%s' AND url = '%s'", $source->feed_nid, $source->id, $value));
break;
case 'guid':
- $nid = db_result(db_query('SELECT nid FROM {feeds_node_item} WHERE feed_nid = %d AND id = "%s" AND guid = "%s"', $source->feed_nid, $source->id, $value));
+ $nid = db_result(db_query("SELECT nid FROM {feeds_node_item} WHERE feed_nid = %d AND id = '%s' AND guid = '%s'", $source->feed_nid, $source->id, $value));
break;
}
if ($nid) {
@@ -323,7 +323,7 @@ class FeedsNodeProcessor extends FeedsProcessor {
* @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;
@@ -341,8 +341,8 @@ function _feeds_node_delete($nid) {
$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 --git a/plugins/FeedsTermProcessor.inc b/plugins/FeedsTermProcessor.inc
index 60529bde9419970ecb02b4654631b9c06b316f3c..6f1dd539c80c6f0079f612d4e83175f486eae908 100644
--- a/plugins/FeedsTermProcessor.inc
+++ b/plugins/FeedsTermProcessor.inc
@@ -79,7 +79,7 @@ class FeedsTermProcessor extends FeedsProcessor {
public function clear(FeedsBatch $batch, 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++;
@@ -170,7 +170,7 @@ class FeedsTermProcessor extends FeedsProcessor {
// 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 --git a/plugins/FeedsUserProcessor.inc b/plugins/FeedsUserProcessor.inc
index fb502c556d88ce3ae455c6c5846552f727e460c7..9d3ae4ba1610dac9f9b1099b83ef05afcca42585 100644
--- a/plugins/FeedsUserProcessor.inc
+++ b/plugins/FeedsUserProcessor.inc
@@ -193,10 +193,10 @@ class FeedsUserProcessor extends FeedsProcessor {
foreach ($this->uniqueTargets($source_item) as $target => $value) {
switch ($target) {
case 'name':
- $uid = db_result(db_query('SELECT uid FROM {users} WHERE name = "%s"', $value));
+ $uid = db_result(db_query("SELECT uid FROM {users} WHERE name = '%s'", $value));
break;
case 'mail':
- $uid = db_result(db_query('SELECT uid FROM {users} WHERE mail = "%s"', $value));
+ $uid = db_result(db_query("SELECT uid FROM {users} WHERE mail = '%s'", $value));
break;
case 'openid':
$uid = db_result(db_query("SELECT uid FROM {authmap} WHERE authname = '%s' AND module = 'openid'", $value));
diff --git a/tests/feeds.test b/tests/feeds.test
index dcbc5b1d2aac84e38f1b0cf297790098b28bd202..57ccb309ba6d9675a3f0fa923b19b0d5022641db 100644
--- a/tests/feeds.test
+++ b/tests/feeds.test
@@ -90,7 +90,7 @@ class FeedsRSStoNodesTest extends FeedsWebTestCase {
$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 @@ class FeedsRSStoNodesTest extends FeedsWebTestCase {
$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 @@ class FeedsRSStoNodesTest extends FeedsWebTestCase {
$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 @@ class FeedsRSStoNodesTest extends FeedsWebTestCase {
$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 @@ class FeedsRSStoNodesTest extends FeedsWebTestCase {
$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 @@ class FeedsRSStoNodesTest extends FeedsWebTestCase {
$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 @@ class FeedsRSStoNodesTest extends FeedsWebTestCase {
$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 @@ class FeedsRSStoNodesTest extends FeedsWebTestCase {
$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 @@ class FeedsRSStoNodesTest extends FeedsWebTestCase {
$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 @@ class FeedsRSStoNodesTest extends FeedsWebTestCase {
$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 @@ class FeedsRSStoNodesTest extends FeedsWebTestCase {
$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.
@@ -413,7 +413,7 @@ class FeedsRSStoDataTest extends FeedsWebTestCase {
$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']);
@@ -464,7 +464,7 @@ class FeedsRSStoDataTest extends FeedsWebTestCase {
$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.
@@ -472,7 +472,7 @@ class FeedsRSStoDataTest extends FeedsWebTestCase {
$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.
@@ -480,7 +480,7 @@ class FeedsRSStoDataTest extends FeedsWebTestCase {
$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.
@@ -488,7 +488,7 @@ class FeedsRSStoDataTest extends FeedsWebTestCase {
$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.
@@ -666,11 +666,11 @@ class FeedsSchedulerTestCase extends FeedsWebTestCase {
// There should be feeds_schedule_num (= 10) feeds updated now.
$schedule = array();
- $count = db_result(db_query('select COUNT(*) from {feeds_schedule} WHERE last_executed_time <> 0'));
+ $count = db_result(db_query("select COUNT(*) from {feeds_schedule} WHERE last_executed_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.
@@ -679,19 +679,19 @@ class FeedsSchedulerTestCase extends FeedsWebTestCase {
// There should be feeds_schedule_num X 2 (= 20) feeds updated now.
$schedule = array();
- $result = db_query('select feed_nid, last_executed_time, scheduled from {feeds_schedule} WHERE last_executed_time <> 0');
+ $result = db_query("select feed_nid, last_executed_time, scheduled from {feeds_schedule} WHERE last_executed_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.
@@ -701,7 +701,7 @@ class FeedsSchedulerTestCase extends FeedsWebTestCase {
// 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_executed_time, scheduled from {feeds_schedule} WHERE last_executed_time <> 0');
+ $result = db_query("select feed_nid, last_executed_time, scheduled from {feeds_schedule} WHERE last_executed_time <> 0");
while ($row = db_fetch_object($result)) {
$equal = $equal && ($row->last_executed_time == $schedule[$row->feed_nid]->last_executed_time);
}
@@ -731,14 +731,14 @@ class FeedsSchedulerTestCase extends FeedsWebTestCase {
// There should not be more nodes than before.
$equal = FALSE;
$output = '';
- $result = db_query('select feed_nid, last_executed_time, scheduled from {feeds_schedule} WHERE last_executed_time <> 0');
+ $result = db_query("select feed_nid, last_executed_time, scheduled from {feeds_schedule} WHERE last_executed_time <> 0");
while ($row = db_fetch_object($result)) {
$equal = $equal || ($row->last_executed_time == $schedule[$row->feed_nid]->last_executed_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 --git a/tests/feeds.test.inc b/tests/feeds.test.inc
index 560c2fb54276c3178f31c4576c87806676a52a48..809c41dbc1cb78d73860bd9b9573879ec54ca1d8 100644
--- a/tests/feeds.test.inc
+++ b/tests/feeds.test.inc
@@ -117,7 +117,7 @@ class FeedsWebTestCase extends DrupalWebTestCase {
$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 @@ class FeedsWebTestCase extends DrupalWebTestCase {
}
// 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 @@ class FeedsWebTestCase extends DrupalWebTestCase {
$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_executed_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_executed_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_executed_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_executed_time = 0 AND scheduled = 0", $id)));
return $nid;
}
@@ -209,7 +209,7 @@ class FeedsWebTestCase extends DrupalWebTestCase {
$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 @@ class FeedsWebTestCase extends DrupalWebTestCase {
$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_executed_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_executed_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_executed_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_executed_time = 0 AND scheduled = 0", $id)));
}
/**
@@ -275,7 +275,7 @@ class FeedsWebTestCase extends DrupalWebTestCase {
*/
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');
diff --git a/tests/feeds_mapper_taxonomy.test b/tests/feeds_mapper_taxonomy.test
index 1a43038e7bc0cedd3e8c3b5cb86e83c4720041d2..2842bf7af16650cf7975973ad27be17234c69a1c 100644
--- a/tests/feeds_mapper_taxonomy.test
+++ b/tests/feeds_mapper_taxonomy.test
@@ -94,8 +94,8 @@ class FeedsMapperTaxonomyTestCase extends FeedsMapperTestCase {
// 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 @@ class FeedsMapperTaxonomyTestCase extends FeedsMapperTestCase {
// 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 @@ class FeedsMapperTaxonomyTestCase extends FeedsMapperTestCase {
$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 @@ class FeedsMapperTaxonomyTestCase extends FeedsMapperTestCase {
$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 @@ class FeedsMapperTaxonomyTestCase extends FeedsMapperTestCase {
$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}")));
}
}