diff options
author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-05-24 15:28:42 +0200 |
---|---|---|
committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-05-24 15:28:42 +0200 |
commit | 37b48d2aef2b82db461c8227b78e01c5cdd8e9c1 (patch) | |
tree | a37e26317a12f52e6c18c4b1b761f7ad36626ba3 /tests | |
parent | 0fe7d8dd7ea1b61ff35cf071e7688332ac5d342e (diff) |
fix a bug that would not display items of feeds without folders
Diffstat (limited to 'tests')
-rw-r--r-- | tests/unit/db/FeedMapperTest.php | 21 | ||||
-rw-r--r-- | tests/unit/db/ItemMapperTest.php | 5 |
2 files changed, 18 insertions, 8 deletions
diff --git a/tests/unit/db/FeedMapperTest.php b/tests/unit/db/FeedMapperTest.php index 460156e5c..3ebcb8ebe 100644 --- a/tests/unit/db/FeedMapperTest.php +++ b/tests/unit/db/FeedMapperTest.php @@ -150,16 +150,25 @@ class FeedMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility { ); $sql = 'SELECT `feeds`.*, COUNT(`items`.`id`) AS `unread_count` ' . 'FROM `*PREFIX*news_feeds` `feeds` ' . + 'LEFT OUTER JOIN `*PREFIX*news_folders` `folders` '. + 'ON `feeds`.`folder_id` = `folders`.`id` ' . 'LEFT JOIN `*PREFIX*news_items` `items` ' . - 'ON `feeds`.`id` = `items`.`feed_id` ' . - 'AND (`items`.`status` & ' . StatusFlag::UNREAD . ') = ' . + 'ON `feeds`.`id` = `items`.`feed_id` ' . + // WARNING: this is a desperate attempt at making this query work + // because prepared statements dont work. This is a possible + // SQL INJECTION RISK WHEN MODIFIED WITHOUT THOUGHT. + // think twice when changing this + 'AND (`items`.`status` & ' . StatusFlag::UNREAD . ') = ' . StatusFlag::UNREAD . ' ' . 'WHERE `feeds`.`user_id` = ? ' . + 'AND (`feeds`.`folder_id` = 0 ' . + 'OR `folders`.`deleted_at` = 0' . + ')' . 'AND `feeds`.`deleted_at` = 0 ' . - 'GROUP BY `feeds`.`id`, `feeds`.`user_id`, `feeds`.`url_hash`,'. - '`feeds`.`url`, `feeds`.`title`, `feeds`.`link`,'. - '`feeds`.`favicon_link`, `feeds`.`added`,'. - '`feeds`.`folder_id`, `feeds`.`prevent_update`, `feeds`.`deleted_at`'; + 'GROUP BY `feeds`.`id`, `feeds`.`user_id`, `feeds`.`url_hash`,'. + '`feeds`.`url`, `feeds`.`title`, `feeds`.`link`,'. + '`feeds`.`favicon_link`, `feeds`.`added`,'. + '`feeds`.`folder_id`, `feeds`.`prevent_update`, `feeds`.`deleted_at`'; $this->setMapperResult($sql, array($userId), $rows); diff --git a/tests/unit/db/ItemMapperTest.php b/tests/unit/db/ItemMapperTest.php index 06565fc1f..8b427923c 100644 --- a/tests/unit/db/ItemMapperTest.php +++ b/tests/unit/db/ItemMapperTest.php @@ -86,9 +86,10 @@ class ItemMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility { 'AND `feeds`.`deleted_at` = 0 ' . 'AND `feeds`.`user_id` = ? ' . $prependTo . - 'JOIN `*PREFIX*news_folders` `folders` ' . + 'LEFT OUTER JOIN `*PREFIX*news_folders` `folders` ' . 'ON `folders`.`id` = `feeds`.`folder_id` ' . - 'AND `folders`.`deleted_at` = 0 ' . + 'WHERE `feeds`.`folder_id` = 0 ' . + 'OR `folders`.`deleted_at` = 0 ' . 'ORDER BY `items`.`id` DESC'; } |