aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCôme Chilliet <91878298+come-nc@users.noreply.github.com>2023-02-21 17:37:45 +0100
committerGitHub <noreply@github.com>2023-02-21 17:37:45 +0100
commit18c4761ab00429f11355bb3f42772a9142577ab5 (patch)
tree5304d7f990550afc8ac388bc107cf8b18aeb0f02
parenta7892881a3fd10ff234d14ea878e3104a81d77e8 (diff)
parent74811813e7218f5c24d199086f5b56f8c476ef45 (diff)
downloadnextcloud-server-18c4761ab00429f11355bb3f42772a9142577ab5.tar.gz
nextcloud-server-18c4761ab00429f11355bb3f42772a9142577ab5.zip
Merge pull request #36795 from nextcloud/fix/remove-erronous-parentheses-in-in-clause
Avoid extra parenthesis around SQL in IN expressions
-rw-r--r--apps/files_sharing/lib/External/Manager.php10
-rw-r--r--lib/private/Repair/RemoveLinkShares.php2
2 files changed, 6 insertions, 6 deletions
diff --git a/apps/files_sharing/lib/External/Manager.php b/apps/files_sharing/lib/External/Manager.php
index 68bc6801e46..d2e113c8bb3 100644
--- a/apps/files_sharing/lib/External/Manager.php
+++ b/apps/files_sharing/lib/External/Manager.php
@@ -660,7 +660,7 @@ class Manager {
$query->delete('federated_reshares')
- ->where($query->expr()->in('share_id', $query->createFunction('(' . $select . ')')));
+ ->where($query->expr()->in('share_id', $query->createFunction($select)));
$query->execute();
$deleteReShares = $this->connection->getQueryBuilder();
@@ -730,10 +730,10 @@ class Manager {
// delete group share entry and matching sub-entries
$qb->delete('share_external')
->where(
- $qb->expr()->orX(
- $qb->expr()->eq('id', $qb->createParameter('share_id')),
- $qb->expr()->eq('parent', $qb->createParameter('share_parent_id'))
- )
+ $qb->expr()->orX(
+ $qb->expr()->eq('id', $qb->createParameter('share_id')),
+ $qb->expr()->eq('parent', $qb->createParameter('share_parent_id'))
+ )
);
foreach ($shares as $share) {
diff --git a/lib/private/Repair/RemoveLinkShares.php b/lib/private/Repair/RemoveLinkShares.php
index e1ce78cdbf3..71eead1053b 100644
--- a/lib/private/Repair/RemoveLinkShares.php
+++ b/lib/private/Repair/RemoveLinkShares.php
@@ -126,7 +126,7 @@ class RemoveLinkShares implements IRepairStep {
$query = $this->connection->getQueryBuilder();
$query->select($query->func()->count('*', 'total'))
->from('share')
- ->where($query->expr()->in('id', $query->createFunction('(' . $subQuery->getSQL() . ')')));
+ ->where($query->expr()->in('id', $query->createFunction($subQuery->getSQL())));
$result = $query->execute();
$data = $result->fetch();