Group summaries: Do not use NULL for name columns

Previously, all name columns in the UNION queries yield NULL except for the Hostgroup or Servicegroup query. In PostgreSQL, this leads to separate result sets because all SELECT columns must appear in the GROUP BY clause, which also includes name columns.
Icinga · Apr 13, 2022 · 6bffe1c · 6bffe1c
1 parent 4972b29
commit 6bffe1c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/library/Icingadb/Model/Hostgroupsummary.php b/library/Icingadb/Model/Hostgroupsummary.php
@@ -107,8 +107,8 @@ public function getUnions()
                 ],
                 [
                     'hostgroup_id'           => 'hostgroup.id',
-                    'hostgroup_name'         => new Expression('NULL'),
-                    'hostgroup_display_name' => new Expression('NULL'),
+                    'hostgroup_name'         => 'hostgroup.name',
+                    'hostgroup_display_name' => 'hostgroup.display_name',
                     'host_id'                => 'host.id',
                     'host_state'             => 'state.soft_state',
                     'host_handled'           => 'state.is_handled',
@@ -126,8 +126,8 @@ public function getUnions()
                 ],
                 [
                     'hostgroup_id'           => 'hostgroup.id',
-                    'hostgroup_name'         => new Expression('NULL'),
-                    'hostgroup_display_name' => new Expression('NULL'),
+                    'hostgroup_name'         => 'hostgroup.name',
+                    'hostgroup_display_name' => 'hostgroup.display_name',
                     'host_id'                => new Expression('NULL'),
                     'host_state'             => new Expression('NULL'),
                     'host_handled'           => new Expression('NULL'),

diff --git a/library/Icingadb/Model/ServicegroupSummary.php b/library/Icingadb/Model/ServicegroupSummary.php
@@ -83,8 +83,8 @@ public function getUnions()
                 ],
                 [
                     'servicegroup_id'           => 'servicegroup.id',
-                    'servicegroup_name'         => new Expression('NULL'),
-                    'servicegroup_display_name' => new Expression('NULL'),
+                    'servicegroup_name'         => 'servicegroup.name',
+                    'servicegroup_display_name' => 'servicegroup.display_name',
                     'service_id'                => 'service.id',
                     'service_state'             => 'state.soft_state',
                     'service_handled'           => 'state.is_handled',