tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-04-08 17:15:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes 2266. Special handling of notification 'output' field to avoid using aggregate function in WHERE clause of query...which dumps an error

Browse Source 
style fixup, exact === usage
This commit is contained in:
Marc DeTrano 2019-05-14 17:17:26 -06:00
parent bc1371bad7
commit 5e5a5c68cc
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/monitoring/library/Monitoring/Backend/Ido/Query/HostnotificationQuery.php
View File

@ -68,6 +68,8 @@ class HostnotificationQuery extends IdoQuery
{ {
if ($col === 'UNIX_TIMESTAMP(hn.start_time)') { if ($col === 'UNIX_TIMESTAMP(hn.start_time)') {
return 'hn.start_time ' . $sign . ' ' . $this->timestampForSql($this->valueToTimestamp($expression)); return 'hn.start_time ' . $sign . ' ' . $this->timestampForSql($this->valueToTimestamp($expression));
} elseif ($col === $this->columnMap['history']['output']) {
return parent::whereToSql('hn.output', $sign, $expression);
} else { } else {
return parent::whereToSql($col, $sign, $expression); return parent::whereToSql($col, $sign, $expression);
} }

2
modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicenotificationQuery.php
View File

@ -68,6 +68,8 @@ class ServicenotificationQuery extends IdoQuery
{ {
if ($col === 'UNIX_TIMESTAMP(sn.start_time)') { if ($col === 'UNIX_TIMESTAMP(sn.start_time)') {
return 'sn.start_time ' . $sign . ' ' . $this->timestampForSql($this->valueToTimestamp($expression)); return 'sn.start_time ' . $sign . ' ' . $this->timestampForSql($this->valueToTimestamp($expression));
} elseif ($col === $this->columnMap['history']['output']) {
return parent::whereToSql('sn.output', $sign, $expression);
} else { } else {
return parent::whereToSql($col, $sign, $expression); return parent::whereToSql($col, $sign, $expression);
} }