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

IdoQuery: Support & and != for subquery filters

Browse Source 
refs #2934
This commit is contained in:
Eric Lippmann 2018-06-20 14:10:50 +02:00
parent 5c8cf64658
commit 4b80b3e7ee
1 changed files with 40 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -527,6 +527,14 @@ abstract class IdoQuery extends DbQuery
*/ */
protected function createSubQueryFilter(FilterExpression $filter, $queryName) protected function createSubQueryFilter(FilterExpression $filter, $queryName)
{ {
$expr = $filter->getExpression();
$op = $filter->getSign();
if (! is_array($expr) && $op !== '!=') {
// Fallback to standard filter behavior
throw new NotImplementedError('');
}
$subQuery = $this->createSubQuery($queryName); $subQuery = $this->createSubQuery($queryName);
$subQuery->setIsSubQuery(); $subQuery->setIsSubQuery();
@ -565,28 +573,49 @@ abstract class IdoQuery extends DbQuery
} }
} }
$groups = []; $subQueryFilter = clone $filter;
foreach ($subQuery->getGroup() as $groupColumn) {
$groups[] = preg_replace('/(?<=^|\s)\w+(?=\.)/', 'sub_$0', $groupColumn);
}
// Clearing the rules prevents the wrong aliased ones from re-appearing
$subQuery->clearGroupingRules()->group($groups);
$filter = clone $filter; if ($op === '!=') {
$filter->setColumn(preg_replace( $exists = 'NOT EXISTS';
if (! is_array($expr)) {
$expr = [$expr];
}
$subQueryFilter = $subQueryFilter->setSign('=');
$op = '=';
} else {
$exists = 'EXISTS';
}
$subQueryFilter->setColumn(preg_replace(
'/(?<=^|\s)\w+(?=\.)/', '/(?<=^|\s)\w+(?=\.)/',
'sub_$0', 'sub_$0',
$subQuery->aliasToColumnName($filter->getColumn()) $subQuery->aliasToColumnName($filter->getColumn())
)); ));
$filter = $filter->andFilter(Filter::where(
$and = count($expr) === 1 ? substr_count($expr[0], '&') + 1 : 0;
if ($op === '=' && $and) {
$subQueryFilter->setExpression(explode('&', $expr[0]));
$groups = $subQuery->getGroup();
$group = $groups[0];
$group = preg_replace('/(?<=^|\s)\w+(?=\.)/', 'sub_$0', $group);
$subQuery->select()->having("COUNT(DISTINCT $group) >= $and");
}
$subQueryFilter = $subQueryFilter->andFilter(Filter::where(
preg_replace('/(?<=^|\s)\w+(?=\.)/', 'sub_$0', $theirs), preg_replace('/(?<=^|\s)\w+(?=\.)/', 'sub_$0', $theirs),
new Zend_Db_Expr($ours) new Zend_Db_Expr($ours)
)); ));
$subQuery->setFilter($filter);
$subQuery
->setFilter($subQueryFilter)
->clearGroupingRules();
// EXISTS is the column name because without any column $this->isCustomVar() fails badly otherwise. // 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. // 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($exists, '', new Zend_Db_Expr($subQuery));
} }
protected function requireFilterColumns(Filter $filter) protected function requireFilterColumns(Filter $filter)