From fdd6a4d59ba6770bc9a824d347566800c66d8a57 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Fri, 10 Apr 2015 15:34:28 +0200 Subject: [PATCH] ServicegroupQuery: Remove COLLATE from query column `servicegroup_name' ...and add a case-insensitive alternative called `servicegroup'. refs #8613 --- .../Monitoring/Backend/Ido/Query/ServicegroupQuery.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php index 76b9b1921..c9ab100c6 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php @@ -7,8 +7,9 @@ class ServicegroupQuery extends IdoQuery { protected $columnMap = array( 'servicegroups' => array( - 'servicegroup_name' => 'sgo.name1 COLLATE latin1_general_ci', - 'servicegroup_alias' => 'sg.alias', + 'servicegroup' => 'sgo.name1 COLLATE latin1_general_ci', + 'servicegroup_name' => 'sgo.name1', + 'servicegroup_alias' => 'sg.alias' ), 'services' => array( 'host' => 'so.name1 COLLATE latin1_general_ci',