diff options
| -rw-r--r-- | db/itemmapper.php | 8 | ||||
| -rw-r--r-- | tests/db/ItemMapperTest.php | 9 |
2 files changed, 8 insertions, 9 deletions
diff --git a/db/itemmapper.php b/db/itemmapper.php index 8f200c39e..2704b775f 100644 --- a/db/itemmapper.php +++ b/db/itemmapper.php @@ -52,15 +52,15 @@ class ItemMapper extends Mapper implements IMapper { private function makeSelectQuery($prependTo){ - return 'SELECT `*PREFIX*news_items`.* FROM `*PREFIX*news_items` `items` '. + return 'SELECT `items`.* FROM `*PREFIX*news_items` `items` '. 'JOIN `*PREFIX*news_feeds` `feeds` ' . - 'ON `*PREFIX*news_feeds`.`id` = `*PREFIX*news_items`.`feed_id` '. - 'AND `*PREFIX*news_feeds`.`user_id` = ? ' . $prependTo; + 'ON `feeds`.`id` = `items`.`feed_id` '. + 'AND `feeds`.`user_id` = ? ' . $prependTo; } private function makeSelectQueryStatus($prependTo) { return $this->makeSelectQuery( - 'AND ((`*PREFIX*news_items`.`status` & ?) > 0) ' . + 'AND ((`items`.`status` & ?) > 0) ' . $prependTo ); } diff --git a/tests/db/ItemMapperTest.php b/tests/db/ItemMapperTest.php index 433120a9f..7c1cb743e 100644 --- a/tests/db/ItemMapperTest.php +++ b/tests/db/ItemMapperTest.php @@ -72,16 +72,15 @@ class ItemMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility { private function makeSelectQuery($prependTo){ - return 'SELECT `*PREFIX*news_items`.* FROM `*PREFIX*news_items` `items` '. + return 'SELECT `items`.* FROM `*PREFIX*news_items` `items` '. 'JOIN `*PREFIX*news_feeds` `feeds` ' . - 'ON `*PREFIX*news_feeds`.`id` = `*PREFIX*news_items`.`feed_id` '. - 'AND `*PREFIX*news_feeds`.`user_id` = ? ' . $prependTo; + 'ON `feeds`.`id` = `items`.`feed_id` '. + 'AND `feeds`.`user_id` = ? ' . $prependTo; } - private function makeSelectQueryStatus($prependTo) { return $this->makeSelectQuery( - 'AND ((`*PREFIX*news_items`.`status` & ?) > 0) ' . + 'AND ((`items`.`status` & ?) > 0) ' . $prependTo ); } |