mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed LIKE parsing to work (#8406)

Browse Source 
* Fixed LIKE parsing to work

* Do not add quotes for values that will already have them
This commit is contained in:
Neil Lathwood
2018-03-16 23:30:51 +00:00
committed by GitHub
parent f95cc1b07f
commit 8136a1be33
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
LibreNMS/Alerting/QueryBuilderParser.php
View File

@ -43,18 +43,16 @@ class QueryBuilderParser implements \JsonSerializable
private static $operators = [
'equal' => "=",
'not_equal' => "!=",
'in' => "IN (?)",
'not_in' => "NOT IN (?)",
'less' => "<",
'less_or_equal' => "<=",
'greater' => ">",
'greater_or_equal' => ">=",
'begins_with' => "ILIKE",
'not_begins_with' => "NOT ILIKE",
'contains' => "ILIKE",
'not_contains' => "NOT ILIKE",
'ends_with' => "ILIKE",
'not_ends_with' => "NOT ILIKE",
'begins_with' => "LIKE (\"%?\")",
'not_begins_with' => "NOT LIKE (\"%?\")",
'contains' => "LIKE (\"%?%\")",
'not_contains' => "NOT LIKE (\"%?%\")",
'ends_with' => "LIKE (\"?%\")",
'not_ends_with' => "NOT LIKE (\"?%\")",
'is_empty' => "=''",
'is_not_empty' => "!=''",
'is_null' => "IS NULL",
@ -272,7 +270,7 @@ class QueryBuilderParser implements \JsonSerializable
// pass through value such as field
$value = trim($value, '`');
$value = $this->expandMacro($value); // check for macros
} elseif ($rule['type'] != 'integer') {
} elseif ($rule['type'] != 'integer' && !str_contains($op, '?')) {
$value = "\"$value\"";
}