diff options
| author | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2023-11-13 20:15:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-13 20:15:42 +0100 |
| commit | 712a4c8e101cf742a3d01f79a494bac898c2874a (patch) | |
| tree | a4ed9a70c1a6ad3bb1dd27c1389b36feac85e6a2 | |
| parent | 2bc499c04fd64c83404c6ac7a3f36ff1eefe47a9 (diff) | |
| parent | bf301df539e43e46a3d978897097e915a60506e1 (diff) | |
| download | nextcloud-server-712a4c8e101cf742a3d01f79a494bac898c2874a.tar.gz nextcloud-server-712a4c8e101cf742a3d01f79a494bac898c2874a.zip | |
Merge pull request #41429 from nextcloud/backport/41417/stable27
[stable27] fix(workflowengine): use andWhere() not second where()
| -rw-r--r-- | apps/workflowengine/lib/Manager.php | 2 | ||||
| -rw-r--r-- | lib/private/DB/QueryBuilder/QueryBuilder.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/workflowengine/lib/Manager.php b/apps/workflowengine/lib/Manager.php index 674cfc65313..24e3c216e48 100644 --- a/apps/workflowengine/lib/Manager.php +++ b/apps/workflowengine/lib/Manager.php @@ -380,7 +380,7 @@ class Manager implements IManager { ->where($qb->expr()->eq('s.type', $qb->createParameter('scope'))); if ($scopeContext->getScope() !== IManager::SCOPE_ADMIN) { - $qb->where($qb->expr()->eq('s.value', $qb->createParameter('scopeId'))); + $qb->andWhere($qb->expr()->eq('s.value', $qb->createParameter('scopeId'))); } $qb->setParameters(['scope' => $scopeContext->getScope(), 'scopeId' => $scopeContext->getScopeId()]); diff --git a/lib/private/DB/QueryBuilder/QueryBuilder.php b/lib/private/DB/QueryBuilder/QueryBuilder.php index 43ed68f5616..039596a8fba 100644 --- a/lib/private/DB/QueryBuilder/QueryBuilder.php +++ b/lib/private/DB/QueryBuilder/QueryBuilder.php @@ -866,7 +866,7 @@ class QueryBuilder implements IQueryBuilder { public function where(...$predicates) { if ($this->getQueryPart('where') !== null && $this->systemConfig->getValue('debug', false)) { // Only logging a warning, not throwing for now. - $e = new QueryException('Using where() on non-empty WHERE part, please verify it is intentional to not call whereAnd() or whereOr() instead. Otherwise consider creating a new query builder object or call resetQueryPart(\'where\') first.'); + $e = new QueryException('Using where() on non-empty WHERE part, please verify it is intentional to not call andWhere() or orWhere() instead. Otherwise consider creating a new query builder object or call resetQueryPart(\'where\') first.'); $this->logger->warning($e->getMessage(), ['exception' => $e]); } |