upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Merge pull request #60356 from nextcloud/backport/60244/stable33

Browse source 
[stable33] remove unneeded sort when listing mail/federated shares
This commit is contained in:
Ferdinand Thiessen 2026-05-13 17:41:04 +02:00 committed by GitHub
commit 4283ebac0b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/federatedfilesharing/lib/FederatedShareProvider.php
View file

@ -406,8 +406,7 @@ class FederatedShareProvider implements IShareProvider, IShareProviderSupportsAl
$qb->select('*')
->from('share')
->where($qb->expr()->eq('parent', $qb->createNamedParameter($parent->getId())))
->andWhere($qb->expr()->in('share_type', $qb->createNamedParameter($this->supportedShareType, IQueryBuilder::PARAM_INT_ARRAY)))
->orderBy('id');
->andWhere($qb->expr()->in('share_type', $qb->createNamedParameter($this->supportedShareType, IQueryBuilder::PARAM_INT_ARRAY)));
$cursor = $qb->executeQuery();
while ($data = $cursor->fetchAssociative()) {
@ -539,8 +538,6 @@ class FederatedShareProvider implements IShareProvider, IShareProviderSupportsAl
$qb->andWhere($qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId())));
$qb->orderBy('id');
$cursor = $qb->executeQuery();
$shares = [];
while ($data = $cursor->fetchAssociative()) {
@ -595,7 +592,9 @@ class FederatedShareProvider implements IShareProvider, IShareProviderSupportsAl
}
$qb->setFirstResult($offset);
$qb->orderBy('id');
if ($offset !== 0 || $limit !== -1) {
$qb->orderBy('id');
}
$cursor = $qb->executeQuery();
$shares = [];
@ -672,8 +671,9 @@ class FederatedShareProvider implements IShareProvider, IShareProviderSupportsAl
$qb->select('*')
->from('share');
// Order by id
$qb->orderBy('id');
if ($offset !== 0 || $limit !== -1) {
$qb->orderBy('id');
}
// Set limit and offset
if ($limit !== -1) {

15
apps/sharebymail/lib/ShareByMailProvider.php
View file

@ -649,8 +649,7 @@ class ShareByMailProvider extends DefaultShareProvider implements IShareProvider
$qb->select('*')
->from('share')
->where($qb->expr()->eq('parent', $qb->createNamedParameter($parent->getId())))
->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL)))
->orderBy('id');
->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL)));
$cursor = $qb->executeQuery();
while ($data = $cursor->fetchAssociative()) {
@ -844,7 +843,9 @@ class ShareByMailProvider extends DefaultShareProvider implements IShareProvider
}
$qb->setFirstResult($offset);
$qb->orderBy('id');
if ($offset !== 0 || $limit !== -1) {
$qb->orderBy('id');
}
$cursor = $qb->executeQuery();
$shares = [];
@ -919,8 +920,10 @@ class ShareByMailProvider extends DefaultShareProvider implements IShareProvider
$qb->select('*')
->from('share');
// Order by id
$qb->orderBy('id');
// Order by id only if we need it for limit/offset
if ($offset !== 0 || $limit !== -1) {
$qb->orderBy('id');
}
// Set limit and offset
if ($limit !== -1) {
@ -1152,8 +1155,6 @@ class ShareByMailProvider extends DefaultShareProvider implements IShareProvider
$qb->andWhere($qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId())));
$qb->orderBy('id');
$cursor = $qb->executeQuery();
$shares = [];
while ($data = $cursor->fetchAssociative()) {