tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-07-28 00:04:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix Host query for PostgreSQL

Browse Source 
refs #11110
This commit is contained in:
Markus Frosch 2016-03-01 00:22:28 +01:00
parent 133b5fb0a1
commit 60f9493862
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
application/tables/IcingaHostTable.php
View File

@ -13,13 +13,18 @@ class IcingaHostTable extends IcingaObjectTable
public function getColumns() public function getColumns()
{ {
if ($this->connection()->getDbType() === 'pgsql')
$parents = "ARRAY_TO_STRING(ARRAY_AGG(ih.object_name), ', ')";
else
$parents = "GROUP_CONCAT(ih.object_name ORDER BY hi.weight SEPARATOR ', ')";
return array( return array(
'id' => 'h.id', 'id' => 'h.id',
'host' => 'h.object_name', 'host' => 'h.object_name',
'object_type' => 'h.object_type', 'object_type' => 'h.object_type',
'address' => 'h.address', 'address' => 'h.address',
'zone' => 'z.object_name', 'zone' => 'z.object_name',
'parents' => "GROUP_CONCAT(ih.object_name ORDER BY hi.weight SEPARATOR ', ')" 'parents' => $parents,
); );
} }
@ -55,7 +60,7 @@ 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') )->group('h.id, z.object_name')
->order('h.object_name'); ->order('h.object_name');
return $query; return $query;