From d70f905f91dd94064bd1202878dc10f054701af8 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Sun, 6 Apr 2014 22:05:09 +0200 Subject: fix deletion of items from users on sqlite --- db/itemmapper.php | 4 ++-- tests/unit/db/ItemMapperTest.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/db/itemmapper.php b/db/itemmapper.php index eee3adb6a..68360cf13 100644 --- a/db/itemmapper.php +++ b/db/itemmapper.php @@ -281,8 +281,8 @@ class ItemMapper extends Mapper implements IMapper { * @param string $userId the name of the user */ public function deleteUser($userId) { - $sql = 'DELETE FROM `*PREFIX*news_items` `items` ' . - 'WHERE `items`.`feed_id` IN (' . + $sql = 'DELETE FROM `*PREFIX*news_items` ' . + 'WHERE `feed_id` IN (' . 'SELECT `feeds`.`id` FROM `*PREFIX*news_feeds` `feeds` ' . 'WHERE `feeds`.`user_id` = ?' . ')'; diff --git a/tests/unit/db/ItemMapperTest.php b/tests/unit/db/ItemMapperTest.php index a13f7d58d..0d5289786 100644 --- a/tests/unit/db/ItemMapperTest.php +++ b/tests/unit/db/ItemMapperTest.php @@ -407,8 +407,8 @@ class ItemMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility { public function testDeleteFromUser(){ $userId = 'john'; - $sql = 'DELETE FROM `*PREFIX*news_items` `items` ' . - 'WHERE `items`.`feed_id` IN (' . + $sql = 'DELETE FROM `*PREFIX*news_items` ' . + 'WHERE `feed_id` IN (' . 'SELECT `feeds`.`id` FROM `*PREFIX*news_feeds` `feeds` ' . 'WHERE `feeds`.`user_id` = ?' . ')'; -- cgit v1.2.3