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

DbQuery: Fix wrong operator precedence when rendering unequal filters 

fixes #13107
refs #12852
This commit is contained in:
Johannes Meyer 2016-11-10 13:10:31 +01:00
parent 14363e52f4
commit 0152a5941d
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
library/Icinga/Data/Db/DbQuery.php
View File

@ -301,7 +301,7 @@ class DbQuery extends SimpleQuery
if ($sign === '=') { if ($sign === '=') {
return $col . ' IN (' . $this->escapeForSql($expression) . ')'; return $col . ' IN (' . $this->escapeForSql($expression) . ')';
} elseif ($sign === '!=') { } elseif ($sign === '!=') {
return $col . ' NOT IN (' . $this->escapeForSql($expression) . ') OR ' . $col . ' IS NULL'; return sprintf('(%1$s NOT IN (%2$s) OR %1$s IS NULL)', $col, $this->escapeForSql($expression));
} }
throw new QueryException('Unable to render array expressions with operators other than equal or not equal'); throw new QueryException('Unable to render array expressions with operators other than equal or not equal');
@ -316,12 +316,15 @@ class DbQuery extends SimpleQuery
return new Zend_Db_Expr('FALSE'); return new Zend_Db_Expr('FALSE');
} }
return $col . ' NOT LIKE ' . $this->escapeForSql($this->escapeWildcards($expression)) return sprintf(
. ' OR ' . $col . ' IS NULL'; '(%1$s NOT LIKE %2$s OR %1$s IS NULL)',
} else { $col,
return $col . ' ' . $sign . ' ' . $this->escapeForSql($expression) . ( $this->escapeForSql($this->escapeWildcards($expression))
$sign === '!=' ? ' OR ' . $col . ' IS NULL' : ''
); );
} elseif ($sign === '!=') {
return sprintf('(%1$s %2$s %3$s OR %1$s IS NULL)', $col, $sign, $this->escapeForSql($expression));
} else {
return sprintf('%s %s %s', $col, $sign, $this->escapeForSql($expression));
} }
} }