From ea874f84021f7926b4501eca13d017a1bfd3f8a5 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Thu, 9 Apr 2015 15:29:01 +0200 Subject: [PATCH] *historyQuery: Remove COLLATE from `host_name' and `service_description' refs #8613 --- .../Backend/Ido/Query/CommentdeletionhistoryQuery.php | 4 ++-- .../Monitoring/Backend/Ido/Query/CommenthistoryQuery.php | 4 ++-- .../Monitoring/Backend/Ido/Query/DowntimeendhistoryQuery.php | 4 ++-- .../Backend/Ido/Query/DowntimestarthistoryQuery.php | 4 ++-- .../Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php | 4 ++-- .../Monitoring/Backend/Ido/Query/StatehistoryQuery.php | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentdeletionhistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentdeletionhistoryQuery.php index 86ca8c8c2..9346ce09a 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentdeletionhistoryQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentdeletionhistoryQuery.php @@ -20,8 +20,8 @@ class CommentdeletionhistoryQuery extends IdoQuery 'host' => 'o.name1 COLLATE latin1_general_ci', 'service' => 'o.name2 COLLATE latin1_general_ci', - 'host_name' => 'o.name1 COLLATE latin1_general_ci', - 'service_description' => 'o.name2 COLLATE latin1_general_ci', + 'host_name' => 'o.name1', + 'service_description' => 'o.name2', 'object_type' => "CASE WHEN o.objecttype_id = 1 THEN 'host' ELSE 'service' END" ) ); diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommenthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommenthistoryQuery.php index fd6f8a72c..6b2f821e9 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommenthistoryQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/CommenthistoryQuery.php @@ -20,8 +20,8 @@ class CommenthistoryQuery extends IdoQuery 'host' => 'o.name1 COLLATE latin1_general_ci', 'service' => 'o.name2 COLLATE latin1_general_ci', - 'host_name' => 'o.name1 COLLATE latin1_general_ci', - 'service_description' => 'o.name2 COLLATE latin1_general_ci', + 'host_name' => 'o.name1', + 'service_description' => 'o.name2', 'object_type' => "CASE WHEN o.objecttype_id = 1 THEN 'host' ELSE 'service' END" ) ); diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeendhistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeendhistoryQuery.php index 1b7d31ccd..42d23ce05 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeendhistoryQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeendhistoryQuery.php @@ -20,8 +20,8 @@ class DowntimeendhistoryQuery extends IdoQuery 'host' => 'o.name1 COLLATE latin1_general_ci', 'service' => 'o.name2 COLLATE latin1_general_ci', - 'host_name' => 'o.name1 COLLATE latin1_general_ci', - 'service_description' => 'o.name2 COLLATE latin1_general_ci', + 'host_name' => 'o.name1', + 'service_description' => 'o.name2', 'object_type' => "CASE WHEN o.objecttype_id = 1 THEN 'host' ELSE 'service' END" ) ); diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimestarthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimestarthistoryQuery.php index a86d47dce..6f23fe174 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimestarthistoryQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimestarthistoryQuery.php @@ -20,8 +20,8 @@ class DowntimestarthistoryQuery extends IdoQuery 'host' => 'o.name1 COLLATE latin1_general_ci', 'service' => 'o.name2 COLLATE latin1_general_ci', - 'host_name' => 'o.name1 COLLATE latin1_general_ci', - 'service_description' => 'o.name2 COLLATE latin1_general_ci', + 'host_name' => 'o.name1', + 'service_description' => 'o.name2', 'object_type' => "CASE WHEN o.objecttype_id = 1 THEN 'host' ELSE 'service' END" ) ); diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php index 09e4184f7..8bbdc0751 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php @@ -20,8 +20,8 @@ class NotificationhistoryQuery extends IdoQuery 'host' => 'o.name1 COLLATE latin1_general_ci', 'service' => 'o.name2 COLLATE latin1_general_ci', - 'host_name' => 'o.name1 COLLATE latin1_general_ci', - 'service_description' => 'o.name2 COLLATE latin1_general_ci', + 'host_name' => 'o.name1', + 'service_description' => 'o.name2', 'object_type' => "CASE WHEN o.objecttype_id = 1 THEN 'host' ELSE 'service' END" ) ); diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php index f17c366bd..ff3c1055a 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php @@ -25,8 +25,8 @@ class StatehistoryQuery extends IdoQuery 'host' => 'sho.name1 COLLATE latin1_general_ci', 'service' => 'sho.name2 COLLATE latin1_general_ci', - 'host_name' => 'sho.name1 COLLATE latin1_general_ci', - 'service_description' => 'sho.name2 COLLATE latin1_general_ci', + 'host_name' => 'sho.name1', + 'service_description' => 'sho.name2', 'object_type' => "CASE WHEN sho.objecttype_id = 1 THEN 'host' ELSE 'service' END" ) );