From ea7d884c09d847855cc83d0a551631905ec7584d Mon Sep 17 00:00:00 2001 From: dilshatm Date: Thu, 8 Mar 2018 01:16:17 +0300 Subject: [PATCH] Fix collation difference in sqlserver input (#3786) (cherry picked from commit a6d366fb849a35d11398ea0d038f7be2e66ed0e3) --- plugins/inputs/sqlserver/sqlserver.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/plugins/inputs/sqlserver/sqlserver.go b/plugins/inputs/sqlserver/sqlserver.go index 49f36b2cf7aa4..118e7807aebc0 100644 --- a/plugins/inputs/sqlserver/sqlserver.go +++ b/plugins/inputs/sqlserver/sqlserver.go @@ -1116,30 +1116,30 @@ DECLARE @delayInterval char(8) = CONVERT(Char(8), DATEADD(SECOND, @secondsBetwee DECLARE @w1 TABLE ( - WaitType nvarchar(64) NOT NULL, + WaitType nvarchar(64) collate SQL_Latin1_General_CP1_CI_AS NOT NULL, WaitTimeInMs bigint NOT NULL, WaitTaskCount bigint NOT NULL, CollectionDate datetime NOT NULL ) DECLARE @w2 TABLE ( - WaitType nvarchar(64) NOT NULL, + WaitType nvarchar(64) collate SQL_Latin1_General_CP1_CI_AS NOT NULL, WaitTimeInMs bigint NOT NULL, WaitTaskCount bigint NOT NULL, CollectionDate datetime NOT NULL ) DECLARE @w3 TABLE ( - WaitType nvarchar(64) NOT NULL + WaitType nvarchar(64) collate SQL_Latin1_General_CP1_CI_AS NOT NULL ) DECLARE @w4 TABLE ( - WaitType nvarchar(64) NOT NULL, - WaitCategory nvarchar(64) NOT NULL + WaitType nvarchar(64) collate SQL_Latin1_General_CP1_CI_AS NOT NULL, + WaitCategory nvarchar(64) collate SQL_Latin1_General_CP1_CI_AS NOT NULL ) DECLARE @w5 TABLE ( - WaitCategory nvarchar(64) NOT NULL, + WaitCategory nvarchar(64) collate SQL_Latin1_General_CP1_CI_AS NOT NULL, WaitTimeInMs bigint NOT NULL, WaitTaskCount bigint NOT NULL ) @@ -1380,12 +1380,12 @@ INSERT @w4 (WaitType, WaitCategory) VALUES ('ABR', 'OTHER') , INSERT @w1 (WaitType, WaitTimeInMs, WaitTaskCount, CollectionDate) SELECT - WaitType = wait_type + WaitType = wait_type collate SQL_Latin1_General_CP1_CI_AS , WaitTimeInMs = SUM(wait_time_ms) , WaitTaskCount = SUM(waiting_tasks_count) , CollectionDate = GETDATE() FROM sys.dm_os_wait_stats -WHERE [wait_type] NOT IN +WHERE [wait_type] collate SQL_Latin1_General_CP1_CI_AS NOT IN ( SELECT WaitType FROM @w3 ) @@ -1396,12 +1396,12 @@ WAITFOR DELAY @delayInterval; INSERT @w2 (WaitType, WaitTimeInMs, WaitTaskCount, CollectionDate) SELECT - WaitType = wait_type + WaitType = wait_type collate SQL_Latin1_General_CP1_CI_AS , WaitTimeInMs = SUM(wait_time_ms) , WaitTaskCount = SUM(waiting_tasks_count) , CollectionDate = GETDATE() FROM sys.dm_os_wait_stats -WHERE [wait_type] NOT IN +WHERE [wait_type] collate SQL_Latin1_General_CP1_CI_AS NOT IN ( SELECT WaitType FROM @w3 )