diff options
| author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-06-01 11:00:25 +0200 |
|---|---|---|
| committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-06-01 11:00:25 +0200 |
| commit | 6475bf5da478a04edc0cc5aa125626a912e613c8 (patch) | |
| tree | 211f5eddb3e9aa6b55a5aaaf5f4bd9d4606e9410 /db | |
| parent | 032380d07cd33a6780e4e147003fca3a9c90ab5d (diff) | |
also consider deleted folders and feeds in the feed update, #214
Diffstat (limited to 'db')
| -rw-r--r-- | db/feedmapper.php | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/db/feedmapper.php b/db/feedmapper.php index 99271f494..5a5aa299f 100644 --- a/db/feedmapper.php +++ b/db/feedmapper.php @@ -108,7 +108,26 @@ class FeedMapper extends Mapper implements IMapper { public function findAll(){ - $sql = 'SELECT * FROM `*PREFIX*news_feeds`'; + $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` ' . + // 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`.`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`'; return $this->findAllRows($sql); } |