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

Remove last logical operator from generated SQL in GenGroupSQL

Browse Source 
Previously this function would output invalid SQL as a logical
operator would be included after every condition. This change
removes the final logical operator so the SQL is valid.

For example, previously the single rule:
`bgpPeers.bgpPeerRemoteAs = "6939" &&"`

Would generate:
```
SELECT DISTINCT(bgpPeers.device_id) FROM bgpPeers WHERE device_id=? && (bgpPeers.bgpPeerRemoteAs = "6939" &&) LIMIT 1
```

This changes means it will generate:
```
SELECT DISTINCT(bgpPeers.device_id) FROM bgpPeers WHERE device_id=? && (bgpPeers.bgpPeerRemoteAs = "6939") LIMIT 1
```
This commit is contained in:
Thom Seddon
2015-11-20 14:58:21 +00:00
parent 69c4f8bb44
commit 05d60936e6
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
includes/device-groups.inc.php
View File

@ -46,6 +46,7 @@ function GenGroupSQL($pattern, $search='') {
$pattern = str_replace($opt, $tmpp[0].'.'.$tmpp[1], $pattern);
}
}
$pattern = substr($pattern, 0, -3);
$tables = array_keys(array_flip($tables));
$x = sizeof($tables);