From 6105d0bb5b455d2378a2a68a5d9ec3149a422be9 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Fri, 2 Oct 2015 21:49:35 +0200 Subject: [PATCH] SONAR-6884 enforce collation SQL_Latin1_General_CP1_CS_AS when creating columns on MSSQL --- .../lib/arjdbc/mssql/adapter.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/server/sonar-web/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mssql/adapter.rb b/server/sonar-web/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mssql/adapter.rb index 6513da01f9d..7e269d7bc3a 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mssql/adapter.rb +++ b/server/sonar-web/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mssql/adapter.rb @@ -79,9 +79,15 @@ module ::ArJdbc # # See: http://msdn.microsoft.com/en-us/library/ms186939.aspx if type.to_s == 'string' and limit == 1073741823 and sqlserver_version != "2000" - 'NVARCHAR(MAX)' + # SONAR-6884 collation added + 'NVARCHAR(MAX) COLLATE SQL_Latin1_General_CP1_CS_AS' + # /SONAR-6884 elsif %w( boolean date datetime ).include?(type.to_s) super(type) # cannot specify limit/precision/scale with these types + elsif type.to_s == 'string' + # SONAR-6884 + super + ' COLLATE SQL_Latin1_General_CP1_CS_AS' + # /SONAR-6884 else super end -- 2.39.5