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

ContactgroupQuery: PostgreSQL grouping... 

refs #9009
This commit is contained in:
Johannes Meyer 2015-06-18 10:09:50 +02:00
parent 9cfca36f46
commit 535b740d0e
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
View File

@ -103,7 +103,6 @@ class ContactgroupQuery extends IdoQuery
'c.contact_object_id = co.object_id', 'c.contact_object_id = co.object_id',
array() array()
); );
$this->group(array('cg.contactgroup_id', 'c.contact_id'));
} }
/** /**
@ -145,12 +144,6 @@ class ContactgroupQuery extends IdoQuery
'ho.object_id = h.host_object_id AND ho.is_active = 1 AND ho.objecttype_id = 1', 'ho.object_id = h.host_object_id AND ho.is_active = 1 AND ho.objecttype_id = 1',
array() array()
); );
if ($this->hasJoinedVirtualTable('contacts')) {
$this->group(array('cg.contactgroup_id', 'c.contact_id'));
} else {
$this->group(array('cg.contactgroup_id'));
}
} }
/** /**
@ -192,11 +185,29 @@ class ContactgroupQuery extends IdoQuery
'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()
); );
}
if ($this->hasJoinedVirtualTable('contacts')) { /**
$this->group(array('cg.contactgroup_id', 'c.contact_id')); * {@inheritdoc}
} else { */
$this->group(array('cg.contactgroup_id')); public function getGroup()
{
$group = array();
if ($this->hasJoinedVirtualTable('hosts') || $this->hasJoinedVirtualTable('services')) {
$group = array('cg.contactgroup_id', 'cgo.object_id');
if ($this->hasJoinedVirtualTable('contacts')) {
$group[] = 'c.contact_id';
$group[] = 'co.object_id';
}
} elseif ($this->hasJoinedVirtualTable('contacts')) {
$group = array(
'cg.contactgroup_id',
'cgo.object_id',
'c.contact_id',
'co.object_id'
);
} }
return $group;
} }
} }