Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DB: Fix offset quotes #1201

Merged
merged 1 commit into from
Feb 27, 2021
+59 −170
Merged

DB: Fix offset quotes #1201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ The format is almost based on [Keep a Changelog](https://keepachangelog.com/en/1
### Changed

### Fixed
- Item list not using ID for offset 2 (#1200)

## [15.4.0-beta1] - 2021-02-23
### Changed
Expand Down
55 changes: 31 additions & 24 deletions lib/Db/ItemMapperV2.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,22 @@ public function findAllAfter(string $userId, int $feedType, int $updatedSince):
return $this->findEntities($builder);
}

/**
* Generate an expression for the offset.
*
* @param bool $oldestFirst Sorting direction
*
* @return string
*/
private function offsetWhere(bool $oldestFirst): string
{
if ($oldestFirst === true) {
return 'items.id > :offset';
}

return 'items.id < :offset';
}

/**
* @param string $userId User identifier
* @param int $feedId Feed identifier
Expand All @@ -424,21 +440,13 @@ public function findAllFeed(
): array {
$builder = $this->db->getQueryBuilder();

if ($oldestFirst === true) {
$offsetWhere = $builder->expr()->lt('items.id', ':offset');
} else {
$offsetWhere = $builder->expr()->gt('items.id', ':offset');
}

$builder->select('items.*')
->from($this->tableName, 'items')
->innerJoin('items', FeedMapperV2::TABLE_NAME, 'feeds', 'items.feed_id = feeds.id')
->andWhere('feeds.user_id = :userId')
->andWhere('items.feed_id = :feedId')
->andWhere($offsetWhere)
->setParameter('userId', $userId)
->setParameter('feedId', $feedId)
->setParameter('offset', $offset)
->setMaxResults($limit)
->orderBy('items.last_modified', ($oldestFirst ? 'ASC' : 'DESC'))
->addOrderBy('items.id', ($oldestFirst ? 'ASC' : 'DESC'));
Expand All @@ -451,6 +459,11 @@ public function findAllFeed(
}
}

if ($offset !== 0) {
$builder->andWhere($this->offsetWhere($oldestFirst))
->setParameter('offset', $offset);
}

if ($hideRead === true) {
$builder->andWhere('items.unread = 1');
}
Expand Down Expand Up @@ -486,20 +499,12 @@ public function findAllFolder(
$folderWhere = $builder->expr()->eq('feeds.folder_id', new Literal($folderId), IQueryBuilder::PARAM_INT);
}

if ($oldestFirst === true) {
$offsetWhere = $builder->expr()->lt('items.id', ':offset');
} else {
$offsetWhere = $builder->expr()->gt('items.id', ':offset');
}

$builder->select('items.*')
->from($this->tableName, 'items')
->innerJoin('items', FeedMapperV2::TABLE_NAME, 'feeds', 'items.feed_id = feeds.id')
->andWhere('feeds.user_id = :userId')
->andWhere($folderWhere)
->andWhere($offsetWhere)
->setParameter('userId', $userId)
->setParameter('offset', $offset)
->setMaxResults($limit)
->orderBy('items.last_modified', ($oldestFirst ? 'ASC' : 'DESC'))
->addOrderBy('items.id', ($oldestFirst ? 'ASC' : 'DESC'));
Expand All @@ -512,6 +517,11 @@ public function findAllFolder(
}
}

if ($offset !== 0) {
$builder->andWhere($this->offsetWhere($oldestFirst))
->setParameter('offset', $offset);
}

if ($hideRead === true) {
$builder->andWhere('items.unread = 1');
}
Expand Down Expand Up @@ -540,19 +550,11 @@ public function findAllItems(
): array {
$builder = $this->db->getQueryBuilder();

if ($oldestFirst === true) {
$offsetWhere = $builder->expr()->lt('items.id', ':offset');
} else {
$offsetWhere = $builder->expr()->gt('items.id', ':offset');
}

$builder->select('items.*')
->from($this->tableName, 'items')
->innerJoin('items', FeedMapperV2::TABLE_NAME, 'feeds', 'items.feed_id = feeds.id')
->andWhere('feeds.user_id = :userId')
->andWhere($offsetWhere)
->setParameter('userId', $userId)
->setParameter('offset', $offset)
->setMaxResults($limit)
->orderBy('items.last_modified', ($oldestFirst ? 'ASC' : 'DESC'))
->addOrderBy('items.id', ($oldestFirst ? 'ASC' : 'DESC'));
Expand All @@ -565,6 +567,11 @@ public function findAllItems(
}
}

if ($offset !== 0) {
$builder->andWhere($this->offsetWhere($oldestFirst))
->setParameter('offset', $offset);
}

switch ($type) {
case ListType::STARRED:
$builder->andWhere('items.starred = 1');
Expand Down
Loading