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

HostgroupQuery: Fix invalid joins 

refs #9009
This commit is contained in:
Johannes Meyer 2015-06-16 09:40:20 +02:00
parent fee6c2f330
commit 6745b0b677
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
View File

@ -64,11 +64,11 @@ class HostgroupQuery extends IdoQuery
*/ */
protected function joinHostobjects() protected function joinHostobjects()
{ {
$this->select->join( $this->select->joinLeft(
array('hgm' => $this->prefix . 'hostgroup_members'), array('hgm' => $this->prefix . 'hostgroup_members'),
'hgm.hostgroup_id = hg.hostgroup_id', 'hgm.hostgroup_id = hg.hostgroup_id',
array() array()
)->join( )->joinLeft(
array('ho' => $this->prefix . 'objects'), array('ho' => $this->prefix . 'objects'),
'hgm.host_object_id = ho.object_id AND ho.is_active = 1 AND ho.objecttype_id = 1', 'hgm.host_object_id = ho.object_id AND ho.is_active = 1 AND ho.objecttype_id = 1',
array() array()
@ -82,7 +82,7 @@ class HostgroupQuery extends IdoQuery
protected function joinHosts() protected function joinHosts()
{ {
$this->requireVirtualTable('hostobjects'); $this->requireVirtualTable('hostobjects');
$this->select->join( $this->select->joinLeft(
array('h' => $this->prefix . 'hosts'), array('h' => $this->prefix . 'hosts'),
'h.host_object_id = ho.object_id', 'h.host_object_id = ho.object_id',
array() array()
@ -95,15 +95,15 @@ class HostgroupQuery extends IdoQuery
protected function joinServicegroups() protected function joinServicegroups()
{ {
$this->requireVirtualTable('services'); $this->requireVirtualTable('services');
$this->select->join( $this->select->joinLeft(
array('sgm' => $this->prefix . 'servicegroup_members'), array('sgm' => $this->prefix . 'servicegroup_members'),
'sgm.service_object_id = s.service_object_id', 'sgm.service_object_id = s.service_object_id',
array() array()
)->join( )->joinLeft(
array('sg' => $this->prefix . 'servicegroups'), array('sg' => $this->prefix . 'servicegroups'),
'sgm.servicegroup_id = sg.' . $this->servicegroup_id, 'sgm.servicegroup_id = sg.' . $this->servicegroup_id,
array() array()
)->join( )->joinLeft(
array('sgo' => $this->prefix . 'objects'), array('sgo' => $this->prefix . 'objects'),
'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4', 'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
array() array()
@ -116,11 +116,11 @@ class HostgroupQuery extends IdoQuery
protected function joinServices() protected function joinServices()
{ {
$this->requireVirtualTable('hosts'); $this->requireVirtualTable('hosts');
$this->select->join( $this->select->joinLeft(
array('s' => $this->prefix . 'services'), array('s' => $this->prefix . 'services'),
's.host_object_id = h.host_object_id', 's.host_object_id = h.host_object_id',
array() array()
)->join( )->joinLeft(
array('so' => $this->prefix . 'objects'), array('so' => $this->prefix . 'objects'),
'so.object_id = s.service_object_id AND so.is_active = 1 AND so.objecttype_id = 2', 'so.object_id = s.service_object_id AND so.is_active = 1 AND so.objecttype_id = 2',
array() array()