diff options
| author | Sean Molenaar <sean@seanmolenaar.eu> | 2021-04-05 15:13:30 +0200 |
|---|---|---|
| committer | Sean Molenaar <SMillerDev@users.noreply.github.com> | 2021-04-05 19:18:19 +0200 |
| commit | 951f3eb7eefae9b7236517a2eca8fcbfe77567b2 (patch) | |
| tree | fafe57eb7d65515e0d3478bb3066c14524b58feb /lib | |
| parent | 5264713b50be83d022b15cd0431134972af25c36 (diff) | |
DB: Allow negative limits
Signed-off-by: Sean Molenaar <sean@seanmolenaar.eu>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Db/ItemMapperV2.php | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/lib/Db/ItemMapperV2.php b/lib/Db/ItemMapperV2.php index c79ac035f..b2e3bcb04 100644 --- a/lib/Db/ItemMapperV2.php +++ b/lib/Db/ItemMapperV2.php @@ -467,7 +467,6 @@ class ItemMapperV2 extends NewsMapperV2 ->andWhere('items.feed_id = :feedId') ->setParameter('userId', $userId) ->setParameter('feedId', $feedId) - ->setMaxResults($limit) ->orderBy('items.last_modified', ($oldestFirst ? 'ASC' : 'DESC')) ->addOrderBy('items.id', ($oldestFirst ? 'ASC' : 'DESC')); @@ -479,6 +478,10 @@ class ItemMapperV2 extends NewsMapperV2 } } + if ($limit >= 1) { + $builder->setMaxResults($limit); + } + if ($offset !== 0) { $builder->andWhere($this->offsetWhere($oldestFirst)) ->setParameter('offset', $offset); @@ -526,7 +529,6 @@ class ItemMapperV2 extends NewsMapperV2 ->andWhere('feeds.deleted_at = 0') ->andWhere($folderWhere) ->setParameter('userId', $userId) - ->setMaxResults($limit) ->orderBy('items.last_modified', ($oldestFirst ? 'ASC' : 'DESC')) ->addOrderBy('items.id', ($oldestFirst ? 'ASC' : 'DESC')); @@ -538,6 +540,10 @@ class ItemMapperV2 extends NewsMapperV2 } } + if ($limit >= 1) { + $builder->setMaxResults($limit); + } + if ($offset !== 0) { $builder->andWhere($this->offsetWhere($oldestFirst)) ->setParameter('offset', $offset); @@ -577,7 +583,6 @@ class ItemMapperV2 extends NewsMapperV2 ->andWhere('feeds.user_id = :userId') ->andWhere('feeds.deleted_at = 0') ->setParameter('userId', $userId) - ->setMaxResults($limit) ->orderBy('items.last_modified', ($oldestFirst ? 'ASC' : 'DESC')) ->addOrderBy('items.id', ($oldestFirst ? 'ASC' : 'DESC')); @@ -589,6 +594,10 @@ class ItemMapperV2 extends NewsMapperV2 } } + if ($limit >= 1) { + $builder->setMaxResults($limit); + } + if ($offset !== 0) { $builder->andWhere($this->offsetWhere($oldestFirst)) ->setParameter('offset', $offset); |