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

db: Respect group by for count queries, really 

Missed that Johannes introduced DbQuery::getGroup().

refs #9828
This commit is contained in:
Eric Lippmann 2015-08-06 10:46:40 +02:00
parent 60675979bc
commit 528382098e
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/Icinga/Data/Db/DbQuery.php
View File

@ -334,8 +334,12 @@ class DbQuery extends SimpleQuery
// TODO: there may be situations where we should clone the "select" // TODO: there may be situations where we should clone the "select"
$count = $this->dbSelect(); $count = $this->dbSelect();
$this->applyFilterSql($count); $this->applyFilterSql($count);
if ($this->useSubqueryCount || $this->group) { $group = $this->getGroup();
if ($this->useSubqueryCount || $group) {
$count->columns($this->columns); $count->columns($this->columns);
if ($group) {
$count->group($group);
}
$columns = array('cnt' => 'COUNT(*)'); $columns = array('cnt' => 'COUNT(*)');
return $this->db->select()->from($count, $columns); return $this->db->select()->from($count, $columns);
} }