zrcadlo
https://github.com/nextcloud/server.git
synchronizováno 2024-08-31 17:55:18 +02:00
fix(workflowengine): use andWhere() not second where()
- an unconditional where() condition is added right before - fixes also wrongly named methods in the Exception message Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Tento commit je obsažen v:
rodič
0f694bec82
revize
93505b2cdd
@ -333,7 +333,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()]);
|
||||
|
@ -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]);
|
||||
}
|
||||
|
||||
|
Načítá se…
Odkázat v novém úkolu
Zablokovat Uživatele