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

monitoring: Fix typos in queries after removing ::getGroup() 

refs #9956
This commit is contained in:
Eric Lippmann 2015-09-30 09:45:18 +02:00
parent 0f622fe10b
commit bcbe7640e7
5 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimestarthistoryQuery.php
View File

@ -97,7 +97,6 @@ class HostdowntimestarthistoryQuery extends IdoQuery
} }
$this->joinedVirtualTables['downtimehistory'] = true; $this->joinedVirtualTables['downtimehistory'] = true;
$this->joinedVirtualTables['history'] = true;
} }
/** /**

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

@ -80,7 +80,7 @@ class HoststatehistoryQuery extends IdoQuery
if ($col === 'UNIX_TIMESTAMP(hh.state_time)') { if ($col === 'UNIX_TIMESTAMP(hh.state_time)') {
return 'hh.state_time ' . $sign . ' ' . $this->timestampForSql($this->valueToTimestamp($expression)); return 'hh.state_time ' . $sign . ' ' . $this->timestampForSql($this->valueToTimestamp($expression));
} elseif ( } elseif (
$col === $this->columnMap['history']['type'] $col === $this->columnMap['statehistory']['type']
&& ! is_array($expression) && ! is_array($expression)
&& array_key_exists($expression, $this->types) && array_key_exists($expression, $this->types)
) { ) {

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

@ -16,7 +16,7 @@ class ServicedowntimeQuery extends IdoQuery
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
protected $groupBase = array('downtimes', array('sd.scheduleddowntime_id', 'so.object_id')); protected $groupBase = array('downtimes' => array('sd.scheduleddowntime_id', 'so.object_id'));
/** /**
* {@inheritdoc} * {@inheritdoc}

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

@ -16,7 +16,7 @@ class ServicedowntimestarthistoryQuery extends IdoQuery
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
protected $groupBase = array('downtimehistory', array('sdh.downtimehistory_id', 'so.object_id')); protected $groupBase = array('downtimehistory' => array('sdh.downtimehistory_id', 'so.object_id'));
/** /**
* {@inheritdoc} * {@inheritdoc}

4
modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatehistoryQuery.php
View File

@ -16,7 +16,7 @@ class ServicestatehistoryQuery extends IdoQuery
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
protected $groupBase = array('statehistory', array('sh.statehistory_id', 'so.object_id')); protected $groupBase = array('statehistory' => array('sh.statehistory_id', 'so.object_id'));
/** /**
* {@inheritdoc} * {@inheritdoc}
@ -81,7 +81,7 @@ class ServicestatehistoryQuery extends IdoQuery
if ($col === 'UNIX_TIMESTAMP(sh.state_time)') { if ($col === 'UNIX_TIMESTAMP(sh.state_time)') {
return 'sh.state_time ' . $sign . ' ' . $this->timestampForSql($this->valueToTimestamp($expression)); return 'sh.state_time ' . $sign . ' ' . $this->timestampForSql($this->valueToTimestamp($expression));
} elseif ( } elseif (
$col === $this->columnMap['history']['type'] $col === $this->columnMap['statehistory']['type']
&& ! is_array($expression) && ! is_array($expression)
&& array_key_exists($expression, $this->types) && array_key_exists($expression, $this->types)
) { ) {