diff options
| author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-04-05 22:56:22 +0200 |
|---|---|---|
| committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-04-05 22:56:22 +0200 |
| commit | 2d8f76d28f47bc3992c0e86c194fe51427805b54 (patch) | |
| tree | d6bac7603c37f24c0e0bdf549c778ba4eb5b640d /db/feedmapper.php | |
| parent | 4560ab85567564e59647994331328d8949df6b5a (diff) | |
fix statusflag db query bugs and unittests
Diffstat (limited to 'db/feedmapper.php')
| -rw-r--r-- | db/feedmapper.php | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/db/feedmapper.php b/db/feedmapper.php index f2c3a8ada..3c931aabb 100644 --- a/db/feedmapper.php +++ b/db/feedmapper.php @@ -43,11 +43,12 @@ class FeedMapper extends Mapper implements IMapper { 'FROM `*PREFIX*news_feeds` `feeds` ' . 'LEFT JOIN `*PREFIX*news_items` `items` ' . 'ON `feeds`.`id` = `items`.`feed_id` ' . - 'AND (`items`.`status` & ?) = ? ' . + 'AND (`items`.`status` & ' . StatusFlag::UNREAD . ') = ' . + StatusFlag::UNREAD . ' ' . 'WHERE `feeds`.`id` = ? ' . 'AND `feeds`.`user_id` = ? ' . 'GROUP BY `feeds`.`id`'; - $params = array(StatusFlag::UNREAD, StatusFlag::UNREAD, $id, $userId); + $params = array($id, $userId); $row = $this->findOneQuery($sql, $params); $feed = new Feed(); @@ -76,10 +77,11 @@ class FeedMapper extends Mapper implements IMapper { 'FROM `*PREFIX*news_feeds` `feeds` ' . 'LEFT JOIN `*PREFIX*news_items` `items` ' . 'ON `feeds`.`id` = `items`.`feed_id` ' . - 'AND (`items`.`status` & ?) = ? ' . + 'AND (`items`.`status` & ' . StatusFlag::UNREAD . ') = ' . + StatusFlag::UNREAD . ' ' . 'WHERE `feeds`.`user_id` = ? ' . 'GROUP BY `feeds`.`id`'; - $params = array(StatusFlag::UNREAD, StatusFlag::UNREAD, $userId); + $params = array($userId); return $this->findAllRows($sql, $params); } @@ -97,11 +99,12 @@ class FeedMapper extends Mapper implements IMapper { 'FROM `*PREFIX*news_feeds` `feeds` ' . 'LEFT JOIN `*PREFIX*news_items` `items` ' . 'ON `feeds`.`id` = `items`.`feed_id` ' . - 'AND (`items`.`status` & ?) = ? ' . + 'AND (`items`.`status` & ' . StatusFlag::UNREAD . ') = ' . + StatusFlag::UNREAD . ' ' . 'WHERE `feeds`.`url_hash` = ? ' . 'AND `feeds`.`user_id` = ? ' . 'GROUP BY `feeds`.`id`'; - $params = array(StatusFlag::UNREAD, StatusFlag::UNREAD, $hash, $userId); + $params = array($hash, $userId); $row = $this->findOneQuery($sql, $params); $feed = new Feed(); |