tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

IdoQuery: Qualify and resolve subquery filters ASAP 

fixes #4508
This commit is contained in:
Johannes Meyer 2021-08-17 11:11:13 +02:00
parent b2274a5589
commit 83557afd35
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
View File

@ -573,7 +573,10 @@ abstract class IdoQuery extends DbQuery
$column = $subQuery->aliasToColumnName($alias); $column = $subQuery->aliasToColumnName($alias);
if (isset($this->caseInsensitiveColumns[$subQuery->aliasToTableName($alias)][$alias])) { if (isset($this->caseInsensitiveColumns[$subQuery->aliasToTableName($alias)][$alias])) {
$column = 'LOWER( ' . $column . ' )'; $column = 'LOWER( ' . $column . ' )';
$subQueryFilter->setColumn($column);
$subQueryFilter->setExpression(array_map('strtolower', (array) $subQueryFilter->getExpression())); $subQueryFilter->setExpression(array_map('strtolower', (array) $subQueryFilter->getExpression()));
} else {
$subQueryFilter->setColumn($column);
} }
$additional = null; $additional = null;
@ -653,10 +656,6 @@ abstract class IdoQuery extends DbQuery
$exists = new FilterExpression($negate ? 'NOT EXISTS' : 'EXISTS', '', new Zend_Db_Expr($subQuery)); $exists = new FilterExpression($negate ? 'NOT EXISTS' : 'EXISTS', '', new Zend_Db_Expr($subQuery));
if ($additional !== null) { if ($additional !== null) {
$alias = $additional->getColumn();
$this->requireColumn($alias);
$additional->setColumn($this->aliasToColumnName($alias));
return Filter::matchAll($exists, $additional); return Filter::matchAll($exists, $additional);
} }