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

EventHistoryQuery: Rename baseQuery to select

This commit is contained in:
Eric Lippmann 2014-04-15 17:59:55 +02:00
parent 67ce376ef0
commit 30e649eeb4
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
View File

@ -2,7 +2,7 @@
namespace Icinga\Module\Monitoring\Backend\Ido\Query;
use \Zend_Db_Select;
use Zend_Db_Select;
class EventHistoryQuery extends IdoQuery
{
@ -50,7 +50,6 @@ class EventHistoryQuery extends IdoQuery
'attempt',
'max_attempts',
);
$this->subQueries = array(
$this->createSubQuery('Statehistory', $columns),
$this->createSubQuery('Downtimestarthistory', $columns),
@ -60,14 +59,13 @@ class EventHistoryQuery extends IdoQuery
);
$sub = $this->db->select()->union($this->subQueries, Zend_Db_Select::SQL_UNION_ALL);
$this->baseQuery = $this->db->select()->from(
$this->select->from(
array('eho' => $this->prefix . 'objects'),
array()
)->join(
array('eh' => $sub),
'eho.' . $this->object_id
. ' = eh.' . $this->object_id
. ' AND eho.is_active = 1',
'eho.' . $this->object_id . ' = eh.' . $this->object_id . ' AND eho.is_active = 1',
array()
);
$this->joinedVirtualTables = array('eventhistory' => true);
@ -75,21 +73,19 @@ class EventHistoryQuery extends IdoQuery
protected function joinHostgroups()
{
$this->baseQuery->join(
$this->select->join(
array('hgm' => $this->prefix . 'hostgroup_members'),
'hgm.host_object_id = eho.object_id',
array()
)->join(
array('hg' => $this->prefix . 'hostgroups'),
"hgm.hostgroup_id = hg.$this->hostgroup_id",
'hgm.hostgroup_id = hg.' . $this->hostgroup_id,
array()
)->join(
array('hgo' => $this->prefix . 'objects'),
'hgo.' . $this->object_id. ' = hg.hostgroup_object_id'
. ' AND hgo.is_active = 1',
'hgo.' . $this->object_id. ' = hg.hostgroup_object_id' . ' AND hgo.is_active = 1',
array()
);
return $this;
}