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

DbConnection: Fix that unequal is handled as equal...

Browse Source 
refs #4814
This commit is contained in:
Johannes Meyer 2022-06-13 14:41:39 +02:00
parent 1bee2db583
commit d663fe84c3
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -544,9 +544,6 @@ class DbConnection implements Selectable, Extensible, Updatable, Reducible, Insp
$sign = $filter->getSign(); $sign = $filter->getSign();
$value = $filter->getExpression(); $value = $filter->getExpression();
$matchWildcard = $sign === '=' && ! $filter instanceof FilterEqual
|| $sign === '!=' && ! $filter instanceof FilterNotEqual;
if (is_array($value)) { if (is_array($value)) {
$comp = []; $comp = [];
$pattern = []; $pattern = [];
@ -582,13 +579,21 @@ class DbConnection implements Selectable, Extensible, Updatable, Reducible, Insp
} }
return count($sql) === 1 ? $sql[0] : '(' . implode(" $operator ", $sql) . ')'; return count($sql) === 1 ? $sql[0] : '(' . implode(" $operator ", $sql) . ')';
} elseif ($matchWildcard && $value !== null && strpos($value, '*') !== false) { } elseif ($sign === '='
&& ! $filter instanceof FilterEqual
&& $value !== null
&& strpos($value, '*') !== false
) {
if ($value === '*') { if ($value === '*') {
return $column . ' IS NOT NULL'; return $column . ' IS NOT NULL';
} }
return $column . ' LIKE ' . $this->dbAdapter->quote(preg_replace('~\*~', '%', $value)); return $column . ' LIKE ' . $this->dbAdapter->quote(preg_replace('~\*~', '%', $value));
} elseif ($matchWildcard && $value !== null && strpos($value, '*') !== false) { } elseif ($sign === '!='
&& ! $filter instanceof FilterNotEqual
&& $value !== null
&& strpos($value, '*') !== false
) {
if ($value === '*') { if ($value === '*') {
return $column . ' IS NULL'; return $column . ' IS NULL';
} }