ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #6391 from nextcloud/backport/only-full-group-by-sql-error/stable28

Browse Source 
[stable28] Avoid sql error on ONLY_FULL_GROUP_BY
This commit is contained in:
Julius Knorr
2024-10-14 08:23:29 +02:00
committed by GitHub
parent 46a83d86ee 4608fe5b3b
commit 9a280b3338
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Db/CardMapper.php
View File

@@ -171,7 +171,7 @@ class CardMapper extends QBMapper implements IPermissionMapper {
public function queryCardsByBoards(array $boardIds): IQueryBuilder { public function queryCardsByBoards(array $boardIds): IQueryBuilder {
$qb = $this->db->getQueryBuilder(); $qb = $this->db->getQueryBuilder();
$qb->select('c.*') $qb->selectDistinct('c.*')
->from('deck_cards', 'c') ->from('deck_cards', 'c')
->innerJoin('c', 'deck_stacks', 's', $qb->expr()->eq('s.id', 'c.stack_id')) ->innerJoin('c', 'deck_stacks', 's', $qb->expr()->eq('s.id', 'c.stack_id'))
->andWhere($qb->expr()->in('s.board_id', $qb->createNamedParameter($boardIds, IQueryBuilder::PARAM_INT_ARRAY))); ->andWhere($qb->expr()->in('s.board_id', $qb->createNamedParameter($boardIds, IQueryBuilder::PARAM_INT_ARRAY)));
@@ -339,7 +339,6 @@ class CardMapper extends QBMapper implements IPermissionMapper {
); );
} }
$qb->groupBy('c.id');
$qb->orderBy('c.last_modified', 'DESC'); $qb->orderBy('c.last_modified', 'DESC');
if ($limit !== null) { if ($limit !== null) {
$qb->setMaxResults($limit); $qb->setMaxResults($limit);
@@ -383,7 +382,6 @@ class CardMapper extends QBMapper implements IPermissionMapper {
$tokenMatching $tokenMatching
); );
$qb->groupBy('comments.id', 'c.id');
$qb->orderBy('comments.id', 'DESC'); $qb->orderBy('comments.id', 'DESC');
if ($limit !== null) { if ($limit !== null) {
$qb->setMaxResults($limit); $qb->setMaxResults($limit);