diff options
| author | Sean Molenaar <sean@seanmolenaar.eu> | 2021-04-06 12:29:36 +0200 |
|---|---|---|
| committer | Sean Molenaar <SMillerDev@users.noreply.github.com> | 2021-04-06 12:43:24 +0200 |
| commit | 90702dd297bf8dac6ac5baa7eb25ecf35f0a7d25 (patch) | |
| tree | ca1ff3f1822e946e2a4457292e7f8aa385aea2af /lib | |
| parent | c4d335b28bb21c2b4c6b0c63e2495821878a8545 (diff) | |
DB: Use boolean parameter for unread/starred
Issue GH-1278
Signed-off-by: Sean Molenaar <sean@seanmolenaar.eu>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Db/ItemMapperV2.php | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/lib/Db/ItemMapperV2.php b/lib/Db/ItemMapperV2.php index b2e3bcb04..44d1740cd 100644 --- a/lib/Db/ItemMapperV2.php +++ b/lib/Db/ItemMapperV2.php @@ -342,7 +342,8 @@ class ItemMapperV2 extends NewsMapperV2 ->addOrderBy('items.id', 'DESC'); if ($hideRead === true) { - $builder->andWhere('items.unread = 1'); + $builder->andWhere('items.unread = :unread') + ->setParameter('unread', true); } return $this->findEntities($builder); @@ -377,7 +378,8 @@ class ItemMapperV2 extends NewsMapperV2 ->addOrderBy('items.id', 'DESC'); if ($hideRead === true) { - $builder->andWhere('items.unread = 1'); + $builder->andWhere('items.unread = :unread') + ->setParameter('unread', true); } return $this->findEntities($builder); @@ -407,10 +409,12 @@ class ItemMapperV2 extends NewsMapperV2 switch ($feedType) { case ListType::STARRED: - $builder->andWhere('items.starred = 1'); + $builder->andWhere('items.starred = :starred') + ->setParameter('starred', true); break; case ListType::UNREAD: - $builder->andWhere('items.unread = 1'); + $builder->andWhere('items.unread = :unread') + ->setParameter('unread', true); break; case ListType::ALL_ITEMS: break; @@ -474,7 +478,7 @@ class ItemMapperV2 extends NewsMapperV2 foreach ($search as $key => $term) { $term = $this->db->escapeLikeParameter($term); $builder->andWhere("items.search_index LIKE :term${key}") - ->setParameter("term${key}", "%$term%"); + ->setParameter("term${key}", "%$term%"); } } @@ -484,11 +488,12 @@ class ItemMapperV2 extends NewsMapperV2 if ($offset !== 0) { $builder->andWhere($this->offsetWhere($oldestFirst)) - ->setParameter('offset', $offset); + ->setParameter('offset', $offset); } if ($hideRead === true) { - $builder->andWhere('items.unread = 1'); + $builder->andWhere('items.unread = :unread') + ->setParameter('unread', true); } return $this->findEntities($builder); @@ -536,7 +541,7 @@ class ItemMapperV2 extends NewsMapperV2 foreach ($search as $key => $term) { $term = $this->db->escapeLikeParameter($term); $builder->andWhere("items.search_index LIKE :term${key}") - ->setParameter("term${key}", "%$term%"); + ->setParameter("term${key}", "%$term%"); } } @@ -546,11 +551,12 @@ class ItemMapperV2 extends NewsMapperV2 if ($offset !== 0) { $builder->andWhere($this->offsetWhere($oldestFirst)) - ->setParameter('offset', $offset); + ->setParameter('offset', $offset); } if ($hideRead === true) { - $builder->andWhere('items.unread = 1'); + $builder->andWhere('items.unread = :unread') + ->setParameter('unread', true); } return $this->findEntities($builder); @@ -600,15 +606,17 @@ class ItemMapperV2 extends NewsMapperV2 if ($offset !== 0) { $builder->andWhere($this->offsetWhere($oldestFirst)) - ->setParameter('offset', $offset); + ->setParameter('offset', $offset); } switch ($type) { case ListType::STARRED: - $builder->andWhere('items.starred = 1'); + $builder->andWhere('items.starred = :starred') + ->setParameter('starred', true); break; case ListType::UNREAD: - $builder->andWhere('items.unread = 1'); + $builder->andWhere('items.unread = :unread') + ->setParameter('unread', true); break; case ListType::ALL_ITEMS: break; |