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

ObjectSetTable: fix a PostgreSQL issue

This commit is contained in:
Thomas Gelf 2022-09-20 15:27:16 +02:00
parent 42b06a0b37
commit 47488d138e
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
library/Director/Web/Table/ObjectSetTable.php
View File

@ -93,13 +93,10 @@ class ObjectSetTable extends ZfQueryBasedTable
'object_type' => 'os.object_type', 'object_type' => 'os.object_type',
'assign_filter' => 'os.assign_filter', 'assign_filter' => 'os.assign_filter',
'description' => 'os.description', 'description' => 'os.description',
'count_services' => 'COUNT(DISTINCT o.id)', 'count_services' => 'COUNT(DISTINCT o.uuid)',
]; ];
if ($this->branchUuid) { if ($this->branchUuid) {
$columns['count_services'] = 'COUNT(DISTINCT COALESCE(o.uuid))';
$columns['branch_uuid'] = 'bos.branch_uuid'; $columns['branch_uuid'] = 'bos.branch_uuid';
}
if ($this->branchUuid) {
$columns = $this->branchifyColumns($columns); $columns = $this->branchifyColumns($columns);
$this->stripSearchColumnAliases(); $this->stripSearchColumnAliases();
} }
@ -142,6 +139,11 @@ class ObjectSetTable extends ZfQueryBasedTable
->where('bos.branch_uuid = ?', $conn->quoteBinary($this->branchUuid->getBytes())); ->where('bos.branch_uuid = ?', $conn->quoteBinary($this->branchUuid->getBytes()));
$query->group('COALESCE(os.uuid, bos.uuid)'); $query->group('COALESCE(os.uuid, bos.uuid)');
$right->group('COALESCE(os.uuid, bos.uuid)'); $right->group('COALESCE(os.uuid, bos.uuid)');
if ($conn->isPgsql()) {
// This is ugly, might want to modify the query - even a subselect looks better
$query->group('bos.uuid')->group('os.uuid')->group('os.id')->group('bos.branch_uuid');
$right->group('bos.uuid')->group('os.uuid')->group('os.id')->group('bos.branch_uuid');
}
$query = $this->db()->select()->union([ $query = $this->db()->select()->union([
'l' => new DbSelectParenthesis($query), 'l' => new DbSelectParenthesis($query),
@ -154,7 +156,18 @@ class ObjectSetTable extends ZfQueryBasedTable
->group('uuid') ->group('uuid')
->where('object_type = ?', 'template') ->where('object_type = ?', 'template')
->order('object_name'); ->order('object_name');
if ($conn->isPgsql()) {
// BS. Drop count? Sub-select? Better query?
$query
->group('uuid')
->group('id')
->group('branch_uuid')
->group('object_name')
->group('object_type')
->group('assign_filter')
->group('description')
->group('count_services');
};
} else { } else {
// Disabled for now, check for correctness: // Disabled for now, check for correctness:
// $query->joinLeft( // $query->joinLeft(