diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2015-10-12 09:28:49 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2015-10-12 09:28:49 +0200 |
| commit | 8f5fbe851fa07e3287f677694f066727bfb7704d (patch) | |
| tree | f45fa610808153686c327fe21d069b3eee3326b8 | |
| parent | 14518156f2b14eb64297b2b70998ae65b81dd11b (diff) | |
| download | sonarqube-8f5fbe851fa07e3287f677694f066727bfb7704d.tar.gz sonarqube-8f5fbe851fa07e3287f677694f066727bfb7704d.zip | |
SONAR-6884 revert systematic usage of latin1 CS collation when creating NVARCHAR columns on MSSQL
| -rw-r--r-- | server/sonar-web/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mssql/adapter.rb | 8 |
1 files changed, 1 insertions, 7 deletions
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 7e269d7bc3a..6513da01f9d 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,15 +79,9 @@ module ::ArJdbc # # See: http://msdn.microsoft.com/en-us/library/ms186939.aspx if type.to_s == 'string' and limit == 1073741823 and sqlserver_version != "2000" - # SONAR-6884 collation added - 'NVARCHAR(MAX) COLLATE SQL_Latin1_General_CP1_CS_AS' - # /SONAR-6884 + 'NVARCHAR(MAX)' 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 |