tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-28 16:24:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix subquery joins for negative filters

Browse Source 
refs #2934
This commit is contained in:
Eric Lippmann 2018-07-05 13:13:41 +02:00
parent b7f0270a24
commit 3a434320e2
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -530,7 +530,7 @@ abstract class IdoQuery extends DbQuery
$expr = $filter->getExpression();
$op = $filter->getSign();
if (! is_array($expr) && $op !== '!=') {
if ($op !== '=' && ! is_array($expr) && $op === '!=') {
// Fallback to standard filter behavior
throw new NotImplementedError('');
}
@ -576,14 +576,13 @@ abstract class IdoQuery extends DbQuery
$subQueryFilter = clone $filter;
if ($op === '!=') {
$exists = 'NOT EXISTS';
$negate = true;
if (! is_array($expr)) {
$expr = [$expr];
}
$subQueryFilter = $subQueryFilter->setSign('=');
$op = '=';
} else {
$exists = 'EXISTS';
$negate = false;
}
$subQueryFilter->setColumn(preg_replace(
@ -592,16 +591,23 @@ abstract class IdoQuery extends DbQuery
$subQuery->aliasToColumnName($filter->getColumn())
));
$and = count($expr) === 1 ? substr_count($expr[0], '&') + 1 : 0;
if ($op === '=' && $and) {
$subQueryFilter->setExpression(explode('&', $expr[0]));
if (count($expr) === 1 && strpos($expr[0], '&') !== false) {
$expr = explode('&', $expr[0]);
$subQueryFilter->setExpression($expr);
$and = true;
} else {
$and = false;
}
if ($and || $negate && ! $and) {
// e.g. hostgroup_name=(ping&linux), hostgroup_name!=ping, hostgroup_name!=(ping|linux)
$groups = $subQuery->getGroup();
$group = $groups[0];
$group = preg_replace('/(?<=^|\s)\w+(?=\.)/', 'sub_$0', $group);
$subQuery->select()->having("COUNT(DISTINCT $group) >= $and");
$cnt = count($expr);
$subQuery->select()->having("COUNT(DISTINCT $group) >= $cnt");
}
$subQueryFilter = $subQueryFilter->andFilter(Filter::where(
@ -618,7 +624,7 @@ abstract class IdoQuery extends DbQuery
// EXISTS is the column name because without any column $this->isCustomVar() fails badly otherwise.
// Additionally it bypasses the non-required optimizations made by our filter rendering implementation.
return new FilterExpression($exists, '', new Zend_Db_Expr($subQuery));
return new FilterExpression($negate ? 'NOT EXISTS' : 'EXISTS', '', new Zend_Db_Expr($subQuery));
}
protected function requireFilterColumns(Filter $filter)