Преглед на файлове

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>
tags/v28.0.0beta3
Arthur Schiwon преди 8 месеца
родител
ревизия
93505b2cdd
променени са 2 файла, в които са добавени 2 реда и са изтрити 2 реда
  1. 1
    1
      apps/workflowengine/lib/Manager.php
  2. 1
    1
      lib/private/DB/QueryBuilder/QueryBuilder.php

+ 1
- 1
apps/workflowengine/lib/Manager.php Целия файл

@@ -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()]);

+ 1
- 1
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]);
}


Loading…
Отказ
Запис