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

Revert "GroupSummary/Postgres: Fix group by in initial join query" 

This reverts commit f47bc46654.

Conflicts:
	modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php

No need to reintroduce group columns.
This commit is contained in:
Eric Lippmann 2015-01-23 15:16:34 +01:00
parent 14a4aaeb77
commit 7500dd9c68
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
View File

@ -100,16 +100,8 @@ class GroupSummaryQuery extends IdoQuery
'severity' => 'service_severity' 'severity' => 'service_severity'
) )
); );
$groupColumn = 'hostgroup';
if (in_array('servicegroup', $this->desiredColumns)) {
$groupColumn = 'servicegroup';
}
$union = $this->db->select()->union(array($hosts, $services), Zend_Db_Select::SQL_UNION_ALL); $union = $this->db->select()->union(array($hosts, $services), Zend_Db_Select::SQL_UNION_ALL);
$this->select->from(array('statussummary' => $union), array())->group(array($groupColumn)); $this->select->from(array('statussummary' => $union), array())->group(array($columns[0]));
$this->joinedVirtualTables = array( $this->joinedVirtualTables = array(
'servicestatussummary' => true, 'servicestatussummary' => true,
'hoststatussummary' => true 'hoststatussummary' => true