Do not adjust the collation when querying host names

refs #8613
Icinga · Apr 8, 2015 · b449127 · b449127
1 parent 1835479
commit b449127
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
@@ -35,7 +35,7 @@ public function setMode($mode)
     protected $columnMap = array(
         'hosts' => array(
             'host'                  => 'ho.name1 COLLATE latin1_general_ci',
-            'host_name'             => 'ho.name1 COLLATE latin1_general_ci',
+            'host_name'             => 'ho.name1',
             'host_display_name'     => 'h.display_name',
             'host_alias'            => 'h.alias',
             'host_address'          => 'h.address',
@@ -168,7 +168,8 @@ public function setMode($mode)
             'servicegroup_alias'    => 'sg.alias'
         ),
         'services' => array(
-            'service_host_name'      => 'so.name1 COLLATE latin1_general_ci',
+            'service_host'           => 'so.name1 COLLATE latin1_general_ci',
+            'service_host_name'      => 'so.name1',
             'service'                => 'so.name2 COLLATE latin1_general_ci',
             'service_description'    => 'so.name2 COLLATE latin1_general_ci',
             'service_display_name'   => 's.display_name',