diff options
| author | Côme Chilliet <come.chilliet@nextcloud.com> | 2023-02-21 12:13:02 +0100 |
|---|---|---|
| committer | backportbot-nextcloud[bot] <backportbot-nextcloud[bot]@users.noreply.github.com> | 2023-02-21 16:48:31 +0000 |
| commit | 19605e58d7060c332c674295be81a6bcc8149d43 (patch) | |
| tree | 2a511f9aa0656e8a6df09f313ccba93a15a32e78 | |
| parent | ab1c44cbf8c8b2ae30d5cb90d4cbf710c6757f10 (diff) | |
| download | nextcloud-server-19605e58d7060c332c674295be81a6bcc8149d43.tar.gz nextcloud-server-19605e58d7060c332c674295be81a6bcc8149d43.zip | |
Avoid extra parenthesis around SQL in IN expressions
The expression builder already suround the SQL with parenthesis when
using in(), so we must not add another pair, this confuses at least
sqlite.
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| -rw-r--r-- | apps/files_sharing/lib/External/Manager.php | 10 | ||||
| -rw-r--r-- | lib/private/Repair/RemoveLinkShares.php | 2 |
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 b9ed4acd57f..003cbe22709 100644 --- a/apps/files_sharing/lib/External/Manager.php +++ b/apps/files_sharing/lib/External/Manager.php @@ -663,7 +663,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(); @@ -733,10 +733,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(); |