From f9107664b01ba6f9cb3283a08a9ae4baf6026215 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Fri, 22 Mar 2013 21:39:39 +0100 Subject: made mappers faster by only joining the relevant rows for each user --- db/feedmapper.php | 14 ++++---- db/foldermapper.php | 8 ++--- db/itemmapper.php | 48 ++++++++++++++-------------- tests/db/FeedMapperTest.php | 18 +++++------ tests/db/FolderMapperTest.php | 10 +++--- tests/db/ItemMapperTest.php | 74 +++++++++++++++++++++---------------------- 6 files changed, 86 insertions(+), 86 deletions(-) diff --git a/db/feedmapper.php b/db/feedmapper.php index 131eb2090..22f71d7a3 100644 --- a/db/feedmapper.php +++ b/db/feedmapper.php @@ -37,11 +37,11 @@ class FeedMapper extends Mapper implements IMapper { public function find($id, $userId){ - $sql = 'SELECT * FROM `*dbprefix*news_feeds` ' . + $sql = 'SELECT * FROM `*PREFIX*news_feeds` ' . 'WHERE `id` = ? ' . 'AND `user_id` = ?'; - $row = $this->findQuery($sql, array($id, $userId)); + $row = $this->findOneQuery($sql, array($id, $userId)); $feed = new Feed(); $feed->fromRow($row); @@ -65,8 +65,8 @@ class FeedMapper extends Mapper implements IMapper { public function findAllFromUser($userId){ $sql = 'SELECT `feeds`.*, COUNT(`items`.`id`) AS `unread_count` ' . - 'FROM `*dbprefix*news_feeds` `feeds` ' . - 'LEFT OUTER JOIN `*dbprefix*news_items` `items` ' . + 'FROM `*PREFIX*news_feeds` `feeds` ' . + 'LEFT OUTER JOIN `*PREFIX*news_items` `items` ' . 'ON `feeds`.`id` = `items`.`feed_id` ' . 'WHERE (`items`.`status` & ?) > 0 ' . 'AND `feeds`.`user_id` = ? ' . @@ -78,19 +78,19 @@ class FeedMapper extends Mapper implements IMapper { public function findAll(){ - $sql = 'SELECT * FROM `*dbprefix*news_feeds`'; + $sql = 'SELECT * FROM `*PREFIX*news_feeds`'; return $this->findAllRows($sql); } public function findByUrlHash($hash, $userId){ - $sql = 'SELECT * FROM `*dbprefix*news_feeds` ' . + $sql = 'SELECT * FROM `*PREFIX*news_feeds` ' . 'WHERE `url_hash` = ? ' . 'AND `user_id` = ?'; $params = array($hash, $userId); - $row = $this->findQuery($sql, $params); + $row = $this->findOneQuery($sql, $params); $feed = new Feed(); $feed->fromRow($row); diff --git a/db/foldermapper.php b/db/foldermapper.php index ef2f31f2d..82739df1b 100644 --- a/db/foldermapper.php +++ b/db/foldermapper.php @@ -36,11 +36,11 @@ class FolderMapper extends Mapper implements IMapper { } public function find($id, $userId){ - $sql = 'SELECT * FROM `*dbprefix*news_folders` ' . + $sql = 'SELECT * FROM `*PREFIX*news_folders` ' . 'WHERE `id` = ? ' . 'AND `user_id` = ?'; - $row = $this->findQuery($sql, array($id, $userId)); + $row = $this->findOneQuery($sql, array($id, $userId)); $folder = new Folder(); $folder->fromRow($row); @@ -63,7 +63,7 @@ class FolderMapper extends Mapper implements IMapper { public function findAllFromUser($userId){ - $sql = 'SELECT * FROM `*dbprefix*news_folders` ' . + $sql = 'SELECT * FROM `*PREFIX*news_folders` ' . 'WHERE `user_id` = ?'; $params = array($userId); @@ -72,7 +72,7 @@ class FolderMapper extends Mapper implements IMapper { public function findByName($folderName, $userId){ - $sql = 'SELECT * FROM `*dbprefix*news_folders` ' . + $sql = 'SELECT * FROM `*PREFIX*news_folders` ' . 'WHERE `name` = ?' . 'AND `user_id` = ?'; $params = array($folderName, $userId); diff --git a/db/itemmapper.php b/db/itemmapper.php index 03bc9e1cd..f7d27ab23 100644 --- a/db/itemmapper.php +++ b/db/itemmapper.php @@ -52,13 +52,13 @@ class ItemMapper extends Mapper implements IMapper { public function find($id, $userId){ - $sql = 'SELECT `*dbprefix*news_items`.* FROM `*dbprefix*news_items` ' . - 'JOIN `*dbprefix*news_feeds` ' . - 'ON `*dbprefix*news_feeds`.`id` = `*dbprefix*news_items`.`feed_id` ' . - 'WHERE `*dbprefix*news_items`.`id` = ? ' . - 'AND `*dbprefix*news_feeds`.`user_id` = ? '; + $sql = 'SELECT `*PREFIX*news_items`.* FROM `*PREFIX*news_items` ' . + 'JOIN `*PREFIX*news_feeds` ' . + 'ON `*PREFIX*news_feeds`.`id` = `*PREFIX*news_items`.`feed_id` ' . + 'AND `*PREFIX*news_feeds`.`user_id` = ? ' . + 'WHERE `*PREFIX*news_items`.`id` = ? '; - $row = $this->findQuery($sql, array($id, $userId)); + $row = $this->findOneQuery($sql, array($id, $userId)); $item = new Item(); $item->fromRow($row); @@ -68,11 +68,11 @@ class ItemMapper extends Mapper implements IMapper { public function starredCount($userId){ - $sql = 'SELECT COUNT(*) AS size FROM `*dbprefix*news_feeds` `feeds` ' . - 'JOIN `*dbprefix*news_items` `items` ' . + $sql = 'SELECT COUNT(*) AS size FROM `*PREFIX*news_feeds` `feeds` ' . + 'JOIN `*PREFIX*news_items` `items` ' . 'ON `items`.`feed_id` = `feeds`.`id` ' . - 'WHERE `feeds`.`user_id` = ? ' . - 'AND ((`items`.`status` & ?) > 0)'; + 'AND `feeds`.`user_id` = ? ' . + 'WHERE ((`items`.`status` & ?) > 0)'; $params = array($userId, StatusFlag::STARRED); @@ -83,12 +83,12 @@ class ItemMapper extends Mapper implements IMapper { public function readFeed($feedId, $userId){ - $sql = 'UPDATE `*dbprefix*news_feeds` `feeds` ' . - 'JOIN `*dbprefix*news_items` `items` ' . + $sql = 'UPDATE `*PREFIX*news_feeds` `feeds` ' . + 'JOIN `*PREFIX*news_items` `items` ' . 'ON `items`.`feed_id` = `feeds`.`id` ' . + 'AND `feeds`.`user_id` = ? ' . 'SET `items`.`status` = (`items`.`status` & ?) ' . - 'WHERE `feeds`.`user_id` = ? ' . - 'AND `items`.`id` = ?'; + 'WHERE `items`.`id` = ?'; $params = array(~StatusFlag::UNREAD, $userId, $feedId); $this->execute($sql, $params); @@ -100,12 +100,12 @@ class ItemMapper extends Mapper implements IMapper { * Queries to find all items from a folder that belongs to a user */ /*private function makeFindAllFromFolderQuery($custom) { - return 'SELECT `*dbprefix*news_items`.* FROM `*dbprefix*news_items` ' . - 'JOIN `*dbprefix*news_feeds` ' . - 'ON `*dbprefix*news_feeds`.`id` = `*dbprefix*news_items`.`feed_id` ' . - 'WHERE `*dbprefix*news_feeds`.`user_id` = ? ' . - 'AND `*dbprefix*news_feeds`.`folder_id` = ? ' . - 'AND ((`*dbprefix*news_items`.`status` & ?) > 0) ' . + return 'SELECT `*PREFIX*news_items`.* FROM `*PREFIX*news_items` ' . + 'JOIN `*PREFIX*news_feeds` ' . + 'ON `*PREFIX*news_feeds`.`id` = `*PREFIX*news_items`.`feed_id` ' . + 'WHERE `*PREFIX*news_feeds`.`user_id` = ? ' . + 'AND `*PREFIX*news_feeds`.`folder_id` = ? ' . + 'AND ((`*PREFIX*news_items`.`status` & ?) > 0) ' . $custom; } @@ -116,7 +116,7 @@ class ItemMapper extends Mapper implements IMapper { } public function findAllFromFolderByLastMofified($userId, $folderId, $status, $lastModified) { - $sql = $this->makeFindAllFromFolderQuery(' AND (`*dbprefix*news_items`.`last_modified` >= ?)'); + $sql = $this->makeFindAllFromFolderQuery(' AND (`*PREFIX*news_items`.`last_modified` >= ?)'); $params = array($userId, $folderId, $status, $lastModified); return $this->findAllRows($sql, $params); } @@ -149,19 +149,19 @@ class ItemMapper extends Mapper implements IMapper { // } // // public function findAllFromFeedByStatus($feedId, $userId, $status){ -// $sql = $this->makeFindAllFromFeedQuery(' AND ((`*dbprefix*news_items`.`status` & ?) > 0)'); +// $sql = $this->makeFindAllFromFeedQuery(' AND ((`*PREFIX*news_items`.`status` & ?) > 0)'); // $params = array($feedId, $userId, $status); // return $this->findAllRows($sql, $params); // } // // public function findAllFromFeedByLastMofified($userId, $feedId, $lastModified){ -// $sql = $this->makeFindAllFromFeedQuery(' AND `*dbprefix*news_items`.last_modified >= ? '); +// $sql = $this->makeFindAllFromFeedQuery(' AND `*PREFIX*news_items`.last_modified >= ? '); // $params = array($feedId, $userId, $lastModified); // return $this->findAllRows($sql, $params); // } // // public function findAllFromFeedByOffset($userId, $feedId, $limit, $offset){ -// $sql = $this->makeFindAllFromFeedQuery(' AND `*dbprefix*news_items`.last_modified >= ? '); +// $sql = $this->makeFindAllFromFeedQuery(' AND `*PREFIX*news_items`.last_modified >= ? '); // $params = array($feedId, $userId, $limit, $offset); // return $this->findAllRows($sql, $params); // } diff --git a/tests/db/FeedMapperTest.php b/tests/db/FeedMapperTest.php index d1cbf5bff..71f82a26b 100644 --- a/tests/db/FeedMapperTest.php +++ b/tests/db/FeedMapperTest.php @@ -56,7 +56,7 @@ class FeedMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility { $rows = array( array('id' => $this->feeds[0]->getId()), ); - $sql = 'SELECT * FROM `*dbprefix*news_feeds` ' . + $sql = 'SELECT * FROM `*PREFIX*news_feeds` ' . 'WHERE `id` = ? ' . 'AND `user_id` = ?'; @@ -71,7 +71,7 @@ class FeedMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility { public function testFindNotFound(){ $userId = 'john'; $id = 3; - $sql = 'SELECT * FROM `*dbprefix*news_feeds` ' . + $sql = 'SELECT * FROM `*PREFIX*news_feeds` ' . 'WHERE `id` = ? ' . 'AND `user_id` = ?'; @@ -89,7 +89,7 @@ class FeedMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility { array('id' => $this->feeds[0]->getId()), array('id' => $this->feeds[1]->getId()) ); - $sql = 'SELECT * FROM `*dbprefix*news_feeds` ' . + $sql = 'SELECT * FROM `*PREFIX*news_feeds` ' . 'WHERE `id` = ? ' . 'AND `user_id` = ?'; @@ -106,7 +106,7 @@ class FeedMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility { array('id' => $this->feeds[0]->getId()), array('id' => $this->feeds[1]->getId()) ); - $sql = 'SELECT * FROM `*dbprefix*news_feeds`'; + $sql = 'SELECT * FROM `*PREFIX*news_feeds`'; $this->setMapperResult($sql, array(), $rows); @@ -122,8 +122,8 @@ class FeedMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility { array('id' => $this->feeds[1]->getId()) ); $sql = 'SELECT `feeds`.*, COUNT(`items`.`id`) AS `unread_count` ' . - 'FROM `*dbprefix*news_feeds` `feeds` ' . - 'LEFT OUTER JOIN `*dbprefix*news_items` `items` ' . + 'FROM `*PREFIX*news_feeds` `feeds` ' . + 'LEFT OUTER JOIN `*PREFIX*news_items` `items` ' . 'ON `feeds`.`id` = `items`.`feed_id` ' . 'WHERE (`items`.`status` & ?) > 0 ' . 'AND `feeds`.`user_id` = ? ' . @@ -141,7 +141,7 @@ class FeedMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility { $row = array( array('id' => $this->feeds[0]->getId()), ); - $sql = 'SELECT * FROM `*dbprefix*news_feeds` ' . + $sql = 'SELECT * FROM `*PREFIX*news_feeds` ' . 'WHERE `url_hash` = ? ' . 'AND `user_id` = ?'; $this->setMapperResult($sql, array($urlHash, $this->user), $row); @@ -153,7 +153,7 @@ class FeedMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility { public function testFindByUrlHashNotFound(){ $urlHash = md5('hihi'); - $sql = 'SELECT * FROM `*dbprefix*news_feeds` ' . + $sql = 'SELECT * FROM `*PREFIX*news_feeds` ' . 'WHERE `url_hash` = ? ' . 'AND `user_id` = ?'; @@ -170,7 +170,7 @@ class FeedMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility { array('id' => $this->feeds[0]->getId()), array('id' => $this->feeds[1]->getId()) ); - $sql = 'SELECT * FROM `*dbprefix*news_feeds` ' . + $sql = 'SELECT * FROM `*PREFIX*news_feeds` ' . 'WHERE `url_hash` = ? ' . 'AND `user_id` = ?'; diff --git a/tests/db/FolderMapperTest.php b/tests/db/FolderMapperTest.php index 924bd7068..b1d4e5e1e 100644 --- a/tests/db/FolderMapperTest.php +++ b/tests/db/FolderMapperTest.php @@ -55,7 +55,7 @@ class FolderMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility { $rows = array( array('id' => $this->folders[0]->getId()), ); - $sql = 'SELECT * FROM `*dbprefix*news_folders` ' . + $sql = 'SELECT * FROM `*PREFIX*news_folders` ' . 'WHERE `id` = ? ' . 'AND `user_id` = ?'; @@ -70,7 +70,7 @@ class FolderMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility { public function testFindNotFound(){ $userId = 'john'; $id = 3; - $sql = 'SELECT * FROM `*dbprefix*news_folders` ' . + $sql = 'SELECT * FROM `*PREFIX*news_folders` ' . 'WHERE `id` = ? ' . 'AND `user_id` = ?'; @@ -88,7 +88,7 @@ class FolderMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility { array('id' => $this->folders[0]->getId()), array('id' => $this->folders[1]->getId()) ); - $sql = 'SELECT * FROM `*dbprefix*news_folders` ' . + $sql = 'SELECT * FROM `*PREFIX*news_folders` ' . 'WHERE `id` = ? ' . 'AND `user_id` = ?'; @@ -106,7 +106,7 @@ class FolderMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility { array('id' => $this->folders[0]->getId()), array('id' => $this->folders[1]->getId()) ); - $sql = 'SELECT * FROM `*dbprefix*news_folders` ' . + $sql = 'SELECT * FROM `*PREFIX*news_folders` ' . 'WHERE `user_id` = ?'; $this->setMapperResult($sql, array($userId), $rows); @@ -122,7 +122,7 @@ class FolderMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility { array('id' => $this->folders[0]->getId()), array('id' => $this->folders[1]->getId()) ); - $sql = 'SELECT * FROM `*dbprefix*news_folders` ' . + $sql = 'SELECT * FROM `*PREFIX*news_folders` ' . 'WHERE `user_id` = ?'; $this->setMapperResult($sql, array($userId), $rows); diff --git a/tests/db/ItemMapperTest.php b/tests/db/ItemMapperTest.php index 9d16d6897..d5c30cb1c 100644 --- a/tests/db/ItemMapperTest.php +++ b/tests/db/ItemMapperTest.php @@ -66,22 +66,22 @@ class ItemMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility { private function makeFindAllFromFolderQuery($custom) { - return 'SELECT `*dbprefix*news_items`.* FROM `*dbprefix*news_items` ' . - 'JOIN `*dbprefix*news_feeds` ' . - 'ON `*dbprefix*news_feeds`.`id` = `*dbprefix*news_items`.`feed_id` ' . - 'WHERE `*dbprefix*news_feeds`.`user_id` = ? ' . - 'AND `*dbprefix*news_feeds`.`folder_id` = ? ' . - 'AND ((`*dbprefix*news_items`.`status` & ?) > 0) ' . + return 'SELECT `*PREFIX*news_items`.* FROM `*PREFIX*news_items` ' . + 'JOIN `*PREFIX*news_feeds` ' . + 'ON `*PREFIX*news_feeds`.`id` = `*PREFIX*news_items`.`feed_id` ' . + 'AND `*PREFIX*news_feeds`.`folder_id` = ? ' . + 'WHERE `*PREFIX*news_feeds`.`user_id` = ? ' . + 'AND ((`*PREFIX*news_items`.`status` & ?) > 0) ' . $custom; } public function testFind(){ - $sql = 'SELECT `*dbprefix*news_items`.* FROM `*dbprefix*news_items` ' . - 'JOIN `*dbprefix*news_feeds` ' . - 'ON `*dbprefix*news_feeds`.`id` = `*dbprefix*news_items`.`feed_id` ' . - 'WHERE `*dbprefix*news_items`.`id` = ? ' . - 'AND `*dbprefix*news_feeds`.`user_id` = ? '; + $sql = 'SELECT `*PREFIX*news_items`.* FROM `*PREFIX*news_items` ' . + 'JOIN `*PREFIX*news_feeds` ' . + 'ON `*PREFIX*news_feeds`.`id` = `*PREFIX*news_items`.`feed_id` ' . + 'AND `*PREFIX*news_feeds`.`user_id` = ? ' . + 'WHERE `*PREFIX*news_items`.`id` = ? '; $this->setMapperResult($sql, array($this->id, $this->userId), $this->row); @@ -96,11 +96,11 @@ class ItemMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility { $row = array( array('size' => 9) ); - $sql = 'SELECT COUNT(*) AS size FROM `*dbprefix*news_feeds` `feeds` ' . - 'JOIN `*dbprefix*news_items` `items` ' . + $sql = 'SELECT COUNT(*) AS size FROM `*PREFIX*news_feeds` `feeds` ' . + 'JOIN `*PREFIX*news_items` `items` ' . 'ON `items`.`feed_id` = `feeds`.`id` ' . - 'WHERE `feeds`.`user_id` = ? ' . - 'AND ((`items`.`status` & ?) > 0)'; + 'AND `feeds`.`user_id` = ? ' . + 'WHERE ((`items`.`status` & ?) > 0)'; $this->setMapperResult($sql, array($userId, StatusFlag::STARRED), $row); @@ -110,12 +110,12 @@ class ItemMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility { public function testReadFeed(){ - $sql = 'UPDATE `*dbprefix*news_feeds` `feeds` ' . - 'JOIN `*dbprefix*news_items` `items` ' . + $sql = 'UPDATE `*PREFIX*news_feeds` `feeds` ' . + 'JOIN `*PREFIX*news_items` `items` ' . 'ON `items`.`feed_id` = `feeds`.`id` ' . + 'AND `feeds`.`user_id` = ? ' . 'SET `items`.`status` = (`items`.`status` & ?) ' . - 'WHERE `feeds`.`user_id` = ? ' . - 'AND `items`.`id` = ?'; + 'WHERE `items`.`id` = ?'; $this->setMapperResult($sql, array(~StatusFlag::UNREAD, $this->user, 3)); $this->mapper->readFeed(3, $this->user); } @@ -148,7 +148,7 @@ class ItemMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility { } public function testFindAllFromFolderByLastModified() { - $sql = $this->makeFindAllFromFolderQuery(' AND (`*dbprefix*news_items`.`last_modified` >= ?)'); + $sql = $this->makeFindAllFromFolderQuery(' AND (`*PREFIX*news_items`.`last_modified` >= ?)'); $status = 2; $lastModified = 100; @@ -174,23 +174,23 @@ class ItemMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility { // $folderId = 3; // $lastModified = 123; // -// $sql = 'SELECT `*dbprefix*news_items`.* FROM `*dbprefix*news_items` ' . -// 'JOIN `*dbprefix*news_feeds` ' . -// 'ON `*dbprefix*news_feeds`.`id` = `*dbprefix*news_items`.`feed_id` ' . -// 'WHERE `*dbprefix*news_feeds`.`user_id` = ? ' . -// 'AND `*dbprefix*news_feeds`.`folder_id` = ? ' . -// 'AND `*dbprefix*news_items`.last_modified >= ? '; +// $sql = 'SELECT `*PREFIX*news_items`.* FROM `*PREFIX*news_items` ' . +// 'JOIN `*PREFIX*news_feeds` ' . +// 'ON `*PREFIX*news_feeds`.`id` = `*PREFIX*news_items`.`feed_id` ' . +// 'WHERE `*PREFIX*news_feeds`.`user_id` = ? ' . +// 'AND `*PREFIX*news_feeds`.`folder_id` = ? ' . +// 'AND `*PREFIX*news_items`.last_modified >= ? '; // // $this->setMapperResult($sql, array($userId, $folderId, $lastModified)); // $result = $this->mapper->findAllFromFolderByLastMofified($userId, $folderId, $lastModified); // } // // public function testFindNotFound(){ -// $sql = 'SELECT `*dbprefix*news_items`.* FROM `*dbprefix*news_items` ' . -// 'JOIN `*dbprefix*news_feeds` ' . -// 'ON `*dbprefix*news_feeds`.`id` = `*dbprefix*news_items`.`feed_id` ' . -// 'WHERE `*dbprefix*news_items`.`id` = ? ' . -// 'AND `*dbprefix*news_feeds`.`user_id` = ? '; +// $sql = 'SELECT `*PREFIX*news_items`.* FROM `*PREFIX*news_items` ' . +// 'JOIN `*PREFIX*news_feeds` ' . +// 'ON `*PREFIX*news_feeds`.`id` = `*PREFIX*news_items`.`feed_id` ' . +// 'WHERE `*PREFIX*news_items`.`id` = ? ' . +// 'AND `*PREFIX*news_feeds`.`user_id` = ? '; // // $this->setMapperResult($sql, array($id, $userId)); // @@ -203,11 +203,11 @@ class ItemMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility { // array('id' => $this->items[0]->getId()), // array('id' => $this->items[1]->getId()) // ); -// $sql = 'SELECT `*dbprefix*news_items`.* FROM `*dbprefix*news_items` ' . -// 'JOIN `*dbprefix*news_feeds` ' . -// 'ON `*dbprefix*news_feeds`.`id` = `*dbprefix*news_items`.`feed_id` ' . -// 'WHERE `*dbprefix*news_items`.`id` = ? ' . -// 'AND `*dbprefix*news_feeds`.`user_id` = ? '; +// $sql = 'SELECT `*PREFIX*news_items`.* FROM `*PREFIX*news_items` ' . +// 'JOIN `*PREFIX*news_feeds` ' . +// 'ON `*PREFIX*news_feeds`.`id` = `*PREFIX*news_items`.`feed_id` ' . +// 'WHERE `*PREFIX*news_items`.`id` = ? ' . +// 'AND `*PREFIX*news_feeds`.`user_id` = ? '; // // // $this->setMapperResult($sql, array($id, $userId), $rows); @@ -244,7 +244,7 @@ class ItemMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility { // $sql = 'SELECT * FROM `*PREFIX*news_items` ' . // 'WHERE user_id = ? ' . // 'AND feed_id = ? ' . -// 'AND ((`*dbprefix*news_items`.`status` & ?) > 0)'; +// 'AND ((`*PREFIX*news_items`.`status` & ?) > 0)'; // // $this->setMapperResult($sql, array($feedId, $userId, $status), $rows); // $result = $this->mapper->findAllFromFeedByStatus($feedId, $userId, $status); -- cgit v1.2.3