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: Don't ignore asterisks when rendering filters

Browse Source 
refs #11885
This commit is contained in:
Johannes Meyer 2016-11-11 09:18:53 +01:00
parent 634a69aec9
commit 3a619eb8c7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,8 +9,8 @@ use Icinga\Data\Inspection;
use PDO; use PDO;
use Iterator; use Iterator;
use Zend_Db; use Zend_Db;
use Zend_Db_Expr;
use Icinga\Data\ConfigObject; use Icinga\Data\ConfigObject;
use Icinga\Data\Db\DbQuery;
use Icinga\Data\Extensible; use Icinga\Data\Extensible;
use Icinga\Data\Filter\Filter; use Icinga\Data\Filter\Filter;
use Icinga\Data\Filter\FilterAnd; use Icinga\Data\Filter\FilterAnd;
@ -452,10 +452,10 @@ class DbConnection implements Selectable, Extensible, Updatable, Reducible, Insp
); );
} elseif ($sign === '=' && strpos($value, '*') !== false) { } elseif ($sign === '=' && strpos($value, '*') !== false) {
if ($value === '*') { if ($value === '*') {
// We'll ignore such filters as it prevents index usage and because "*" means anything, anything means // We'll ignore such filters as it prevents index usage and because "*" means anything, so whether we're
// all whereas all means that whether we use a filter to match anything or no filter at all makes no // using a real column with a valid comparison here or just an expression which can only be evaluated to
// difference, except for performance reasons... // true makes no difference, except for performance reasons...
return ''; return new Zend_Db_Expr('TRUE');
} }
return $column . ' LIKE ' . $this->dbAdapter->quote(preg_replace('~\*~', '%', $value)); return $column . ' LIKE ' . $this->dbAdapter->quote(preg_replace('~\*~', '%', $value));
@ -464,7 +464,7 @@ class DbConnection implements Selectable, Extensible, Updatable, Reducible, Insp
// We'll ignore such filters as it prevents index usage and because "*" means nothing, so whether we're // We'll ignore such filters as it prevents index usage and because "*" means nothing, so whether we're
// using a real column with a valid comparison here or just an expression which cannot be evaluated to // using a real column with a valid comparison here or just an expression which cannot be evaluated to
// true makes no difference, except for performance reasons... // true makes no difference, except for performance reasons...
return $this->dbAdapter->quote(0); return new Zend_Db_Expr('FALSE');
} }
return sprintf( return sprintf(