diff options
author | Sean Molenaar <sean@seanmolenaar.eu> | 2021-03-01 21:10:46 +0100 |
---|---|---|
committer | Sean Molenaar <SMillerDev@users.noreply.github.com> | 2021-03-31 22:39:00 +0200 |
commit | 78dce7ffe18665bf083ff69631db8ae128a2b99f (patch) | |
tree | 1f4e61970b7461afd968552f4bccef53daedbb93 /lib/Db | |
parent | 17f773b723538eedf5bd2efcb8d2c85783d7050f (diff) |
DB: Updates should use set()
Issue GH-1211
Signed-off-by: Sean Molenaar <sean@seanmolenaar.eu>
Diffstat (limited to 'lib/Db')
-rw-r--r-- | lib/Db/FeedMapperV2.php | 32 | ||||
-rw-r--r-- | lib/Db/FolderMapperV2.php | 43 | ||||
-rw-r--r-- | lib/Db/ItemMapperV2.php | 36 |
3 files changed, 81 insertions, 30 deletions
diff --git a/lib/Db/FeedMapperV2.php b/lib/Db/FeedMapperV2.php index 5e346732c..eaa9030cc 100644 --- a/lib/Db/FeedMapperV2.php +++ b/lib/Db/FeedMapperV2.php @@ -16,6 +16,7 @@ namespace OCA\News\Db; use OCA\News\Utility\Time; use OCP\AppFramework\Db\DoesNotExistException; use OCP\AppFramework\Db\MultipleObjectsReturnedException; +use OCP\DB\Exception as DBException; use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\IDBConnection; use OCP\AppFramework\Db\Entity; @@ -158,23 +159,40 @@ class FeedMapperV2 extends NewsMapperV2 * @param string $userId * @param int $id * @param int|null $maxItemID + * + * @return int + * @throws DBException + * + * @TODO Update for NC 21 */ - public function read(string $userId, int $id, ?int $maxItemID = null): void + public function read(string $userId, int $id, ?int $maxItemID = null): int { - $builder = $this->db->getQueryBuilder(); - $builder->update(ItemMapperV2::TABLE_NAME, 'items') + $idBuilder = $this->db->getQueryBuilder(); + $idBuilder->select('items.id') + ->from(ItemMapperV2::TABLE_NAME, 'items') ->innerJoin('items', FeedMapperV2::TABLE_NAME, 'feeds', 'items.feed_id = feeds.id') - ->setValue('unread', 0) ->andWhere('feeds.user_id = :userId') ->andWhere('feeds.id = :feedId') ->setParameter('userId', $userId) ->setParameter('feedId', $id); if ($maxItemID !== null) { - $builder->andWhere('items.id =< :maxItemId') - ->setParameter('maxItemId', $maxItemID); + $idBuilder->andWhere('items.id <= :maxItemId') + ->setParameter('maxItemId', $maxItemID); } - $this->db->executeUpdate($builder->getSQL()); + $idList = array_map(function ($value): int { + return intval($value['id']); + }, $this->db->executeQuery($idBuilder->getSQL(), $idBuilder->getParameters())->fetchAll()); + + $builder = $this->db->getQueryBuilder(); + $builder->update(ItemMapperV2::TABLE_NAME) + ->set('unread', $builder->createParameter('unread')) + ->andWhere('id IN (:idList)') + ->andWhere('unread != :unread') + ->setParameter('unread', false, IQueryBuilder::PARAM_BOOL) + ->setParameter('idList', $idList, IQueryBuilder::PARAM_INT_ARRAY); + + return $this->db->executeUpdate($builder->getSQL(), $builder->getParameters(), $builder->getParameterTypes()); } } diff --git a/lib/Db/FolderMapperV2.php b/lib/Db/FolderMapperV2.php index 12fa26887..d0d0cbec1 100644 --- a/lib/Db/FolderMapperV2.php +++ b/lib/Db/FolderMapperV2.php @@ -15,6 +15,8 @@ namespace OCA\News\Db; use OCA\News\Utility\Time; use OCP\AppFramework\Db\Entity; +use OCP\DB\Exception as DBException; +use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\IDBConnection; /** @@ -101,24 +103,39 @@ class FolderMapperV2 extends NewsMapperV2 * @param int $id * @param int|null $maxItemID * - * @return void + * @return int + * + * @throws DBException + * @TODO Update for NC 21 */ - public function read(string $userId, int $id, ?int $maxItemID = null): void + public function read(string $userId, int $id, ?int $maxItemID = null): int { - $builder = $this->db->getQueryBuilder(); - $builder->update(ItemMapperV2::TABLE_NAME, 'items') - ->innerJoin('items', FeedMapperV2::TABLE_NAME, 'feeds', 'items.feed_id = feeds.id') - ->setValue('unread', 0) - ->andWhere('feeds.user_id = :userId') - ->andWhere('feeds.folder_id = :folderId') - ->setParameter('userId', $userId) - ->setParameter('folderId', $id); + $idBuilder = $this->db->getQueryBuilder(); + $idBuilder->select('items.id') + ->from(ItemMapperV2::TABLE_NAME, 'items') + ->innerJoin('items', FeedMapperV2::TABLE_NAME, 'feeds', 'items.feed_id = feeds.id') + ->andWhere('feeds.user_id = :userId') + ->andWhere('feeds.folder_id = :folderId') + ->setParameter('userId', $userId) + ->setParameter('folderId', $id); if ($maxItemID !== null) { - $builder->andWhere('items.id =< :maxItemId') - ->setParameter('maxItemId', $maxItemID); + $idBuilder->andWhere('items.id <= :maxItemId') + ->setParameter('maxItemId', $maxItemID); } - $this->db->executeUpdate($builder->getSQL()); + $idList = array_map(function ($value): int { + return intval($value['id']); + }, $this->db->executeQuery($idBuilder->getSQL(), $idBuilder->getParameters())->fetchAll()); + + $builder = $this->db->getQueryBuilder(); + $builder->update(ItemMapperV2::TABLE_NAME) + ->set('unread', $builder->createParameter('unread')) + ->andWhere('id IN (:idList)') + ->andWhere('unread != :unread') + ->setParameter('unread', false, IQueryBuilder::PARAM_BOOL) + ->setParameter('idList', $idList, IQueryBuilder::PARAM_INT_ARRAY); + + return $this->db->executeUpdate($builder->getSQL(), $builder->getParameters(), $builder->getParameterTypes()); } } diff --git a/lib/Db/ItemMapperV2.php b/lib/Db/ItemMapperV2.php index a8b101719..c79ac035f 100644 --- a/lib/Db/ItemMapperV2.php +++ b/lib/Db/ItemMapperV2.php @@ -19,6 +19,7 @@ use OCA\News\Utility\Time; use OCP\AppFramework\Db\DoesNotExistException; use OCP\AppFramework\Db\Entity; use OCP\AppFramework\Db\MultipleObjectsReturnedException; +use OCP\DB\Exception as DBException; use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\IDBConnection; @@ -254,20 +255,35 @@ class ItemMapperV2 extends NewsMapperV2 * @param int $maxItemId * * @TODO: Update this for NC 21 + * + * @return int + * + * @throws DBException */ - public function readAll(string $userId, int $maxItemId): void + public function readAll(string $userId, int $maxItemId): int { - $builder = $this->db->getQueryBuilder(); + $idBuilder = $this->db->getQueryBuilder(); + $idBuilder->select('items.id') + ->from(ItemMapperV2::TABLE_NAME, 'items') + ->innerJoin('items', FeedMapperV2::TABLE_NAME, 'feeds', 'items.feed_id = feeds.id') + ->andWhere('feeds.user_id = :userId') + ->andWhere('items.id <= :maxItemId') + ->setParameter('userId', $userId) + ->setParameter('maxItemId', $maxItemId); - $builder->update($this->tableName, 'items') - ->innerJoin('items', FeedMapperV2::TABLE_NAME, 'feeds', 'items.feed_id = feeds.id') - ->setValue('unread', 0) - ->andWhere('items.id =< :maxItemId') - ->andWhere('feeds.user_id = :userId') - ->setParameter('maxItemId', $maxItemId) - ->setParameter('userId', $userId); + $idList = array_map(function ($value): int { + return intval($value['id']); + }, $this->db->executeQuery($idBuilder->getSQL(), $idBuilder->getParameters())->fetchAll()); - $this->db->executeUpdate($builder->getSQL()); + $builder = $this->db->getQueryBuilder(); + $builder->update(self::TABLE_NAME) + ->set('unread', $builder->createParameter('unread')) + ->andWhere('id IN (:idList)') + ->andWhere('unread != :unread') + ->setParameter('unread', false, IQueryBuilder::PARAM_BOOL) + ->setParameter('idList', $idList, IQueryBuilder::PARAM_INT_ARRAY); + + return $this->db->executeUpdate($builder->getSQL(), $builder->getParameters(), $builder->getParameterTypes()); } /** |