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

DbConnection: Explicitly check for NULL when rendering unequal filters 

resolves #12852
This commit is contained in:
Johannes Meyer 2016-11-11 09:17:58 +01:00
parent 6a37d1e6ad
commit 634a69aec9
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -444,7 +444,7 @@ class DbConnection implements Selectable, Extensible, Updatable, Reducible, Insp
if ($sign === '=') { if ($sign === '=') {
return $column . ' IN (' . $this->dbAdapter->quote($value) . ')'; return $column . ' IN (' . $this->dbAdapter->quote($value) . ')';
} elseif ($sign === '!=') { } elseif ($sign === '!=') {
return $column . ' NOT IN (' . $this->dbAdapter->quote($value) . ')'; return sprintf('(%1$s NOT IN (%2$s) OR %1$s IS NULL)', $column, $this->dbAdapter->quote($value));
} }
throw new ProgrammingError( throw new ProgrammingError(
@ -467,9 +467,15 @@ class DbConnection implements Selectable, Extensible, Updatable, Reducible, Insp
return $this->dbAdapter->quote(0); return $this->dbAdapter->quote(0);
} }
return $column . ' NOT LIKE ' . $this->dbAdapter->quote(preg_replace('~\*~', '%', $value)); return sprintf(
'(%1$s NOT LIKE %2$s OR %1$s IS NULL)',
$column,
$this->dbAdapter->quote(preg_replace('~\*~', '%', $value))
);
} elseif ($sign === '!=') {
return sprintf('(%1$s != %2$s OR %1$s IS NULL)', $column, $this->dbAdapter->quote($value));
} else { } else {
return $column . ' ' . $sign . ' ' . $this->dbAdapter->quote($value); return sprintf('%s %s %s', $column, $sign, $this->dbAdapter->quote($value));
} }
} }