summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2014-02-08 20:59:08 +0100
committerBernhard Posselt <dev@bernhard-posselt.com>2014-02-08 20:59:08 +0100
commit32b5d57dbcff0c9744afcab4f852e658ed103686 (patch)
treedad6a483a68b4362e5ccaa68f2af19133a0e62f6
parent30e31181656534206db1eab2cf532a4ba505ddbf (diff)
fix broken sql statement when deleting folders
-rw-r--r--db/foldermapper.php2
-rw-r--r--tests/unit/db/FolderMapperTest.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/db/foldermapper.php b/db/foldermapper.php
index 3cbc05890..8f6c32cde 100644
--- a/db/foldermapper.php
+++ b/db/foldermapper.php
@@ -92,7 +92,7 @@ class FolderMapper extends Mapper implements IMapper {
$params = array($entity->getId());
$this->execute($sql, $params);
- $sql = 'DELETE `items` FROM `*PREFIX*news_items` `items` '.
+ $sql = 'DELETE FROM `*PREFIX*news_items` `items` '.
'LEFT JOIN `*PREFIX*news_feeds` `feeds` ON '.
'`items`.`feed_id` = `feeds`.`id` WHERE `feeds`.`id` IS NULL';
diff --git a/tests/unit/db/FolderMapperTest.php b/tests/unit/db/FolderMapperTest.php
index 928631636..082931c25 100644
--- a/tests/unit/db/FolderMapperTest.php
+++ b/tests/unit/db/FolderMapperTest.php
@@ -146,7 +146,7 @@ class FolderMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility {
$sql2 = 'DELETE FROM `*PREFIX*news_feeds` WHERE `folder_id` = ?';
- $sql3 = 'DELETE `items` FROM `*PREFIX*news_items` `items` '.
+ $sql3 = 'DELETE FROM `*PREFIX*news_items` `items` '.
'LEFT JOIN `*PREFIX*news_feeds` `feeds` ON '.
'`items`.`feed_id` = `feeds`.`id` WHERE `feeds`.`id` IS NULL';
$arguments2 = array($folder->getId());