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

ServicegroupQuery: Fix invalid joins 

refs #9009
This commit is contained in:
Johannes Meyer 2015-06-16 09:41:43 +02:00
parent 755da0c210
commit 1dd21c2969
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
View File

@ -61,15 +61,15 @@ class ServicegroupQuery extends IdoQuery
protected function joinHostgroups() protected function joinHostgroups()
{ {
$this->requireVirtualTable('services'); $this->requireVirtualTable('services');
$this->select->join( $this->select->joinLeft(
array('hgm' => $this->prefix . 'hostgroup_members'), array('hgm' => $this->prefix . 'hostgroup_members'),
'hgm.host_object_id = s.host_object_id', 'hgm.host_object_id = s.host_object_id',
array() array()
)->join( )->joinLeft(
array('hg' => $this->prefix . 'hostgroups'), array('hg' => $this->prefix . 'hostgroups'),
'hg.hostgroup_id = hgm.hostgroup_id', 'hg.hostgroup_id = hgm.hostgroup_id',
array() array()
)->join( )->joinLeft(
array('hgo' => $this->prefix . 'objects'), array('hgo' => $this->prefix . 'objects'),
'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3', 'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
array() array()
@ -82,7 +82,7 @@ class ServicegroupQuery extends IdoQuery
protected function joinHosts() protected function joinHosts()
{ {
$this->requireVirtualTable('services'); $this->requireVirtualTable('services');
$this->select->join( $this->select->joinLeft(
array('h' => $this->prefix . 'hosts'), array('h' => $this->prefix . 'hosts'),
'h.host_object_id = s.host_object_id', 'h.host_object_id = s.host_object_id',
array() array()
@ -94,11 +94,11 @@ class ServicegroupQuery extends IdoQuery
*/ */
protected function joinServiceobjects() protected function joinServiceobjects()
{ {
$this->select->join( $this->select->joinLeft(
array('sgm' => $this->prefix . 'servicegroup_members'), array('sgm' => $this->prefix . 'servicegroup_members'),
'sgm.' . $this->servicegroup_id . ' = sg.' . $this->servicegroup_id, 'sgm.' . $this->servicegroup_id . ' = sg.' . $this->servicegroup_id,
array() array()
)->join( )->joinLeft(
array('so' => $this->prefix . 'objects'), array('so' => $this->prefix . 'objects'),
'sgm.service_object_id = so.object_id', 'sgm.service_object_id = so.object_id',
array() array()
@ -112,7 +112,7 @@ class ServicegroupQuery extends IdoQuery
protected function joinServices() protected function joinServices()
{ {
$this->requireVirtualTable('serviceobjects'); $this->requireVirtualTable('serviceobjects');
$this->select->join( $this->select->joinLeft(
array('s' => $this->prefix . 'services'), array('s' => $this->prefix . 'services'),
's.service_object_id = so.object_id', 's.service_object_id = so.object_id',
array() array()