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

IcingaHostTable: order related objects for pgsql

This commit is contained in:
Thomas Gelf 2016-03-01 04:27:04 +01:00
parent a8768c7741
commit a9c63cf325
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
application/tables/IcingaHostTable.php
View File

@ -13,10 +13,11 @@ class IcingaHostTable extends IcingaObjectTable
public function getColumns() public function getColumns()
{ {
if ($this->connection()->getDbType() === 'pgsql') if ($this->connection()->getDbType() === 'pgsql') {
$parents = "ARRAY_TO_STRING(ARRAY_AGG(ih.object_name), ', ')"; $parents = "ARRAY_TO_STRING(ARRAY_AGG(ih.object_name ORDER BY hi.weight), ', ')";
else } else {
$parents = "GROUP_CONCAT(ih.object_name ORDER BY hi.weight SEPARATOR ', ')"; $parents = "GROUP_CONCAT(ih.object_name ORDER BY hi.weight SEPARATOR ', ')";
}
return array( return array(
'id' => 'h.id', 'id' => 'h.id',
@ -60,8 +61,9 @@ class IcingaHostTable extends IcingaObjectTable
array('ih' => 'icinga_host'), array('ih' => 'icinga_host'),
'hi.parent_host_id = ih.id', 'hi.parent_host_id = ih.id',
array() array()
)->group('h.id, z.object_name') )->group('h.id')
->order('h.object_name'); ->group('z.id')
->order('h.object_name');
return $query; return $query;
} }