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

monitoring: Remove unnecessary columns in the GROUP BY list for MySQL 

refs #9956
This commit is contained in:
Eric Lippmann 2015-09-30 09:45:52 +02:00
parent bcbe7640e7
commit 527b146054
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
View File

@ -1001,6 +1001,9 @@ abstract class IdoQuery extends DbQuery
} }
$groupedTables[$table] = true; $groupedTables[$table] = true;
} }
if ($this->getDatasource()->getDbType() !== 'pgsql') {
return $group;
}
$columnIterator = new AppendIterator(); $columnIterator = new AppendIterator();
$columnIterator->append(new ColumnFilterIterator($this->columns)); $columnIterator->append(new ColumnFilterIterator($this->columns));
$columnIterator->append(new ArrayIterator($this->orderColumns)); $columnIterator->append(new ArrayIterator($this->orderColumns));
@ -1068,7 +1071,7 @@ abstract class IdoQuery extends DbQuery
} }
} }
return $group; return array_unique($group);
} }
// TODO: Move this away, see note related to $idoVersion var // TODO: Move this away, see note related to $idoVersion var