aboutsummaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorJulien Lancelot <julien.lancelot@sonarsource.com>2015-12-02 09:28:42 +0100
committerJulien Lancelot <julien.lancelot@sonarsource.com>2015-12-03 19:11:09 +0100
commitcda69c78eb72a9bc6f8c54f154935a6da666c127 (patch)
treefb18191427aca7414d81eeec94a31e2861813782 /server
parent089d238e2a720cd36daf0d80bbacd2b905513796 (diff)
downloadsonarqube-cda69c78eb72a9bc6f8c54f154935a6da666c127.tar.gz
sonarqube-cda69c78eb72a9bc6f8c54f154935a6da666c127.zip
SONAR-6884 Create and update columns on MsSQL with collation
Diffstat (limited to 'server')
-rw-r--r--server/sonar-web/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mssql/adapter.rb4
1 files changed, 3 insertions, 1 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 6513da01f9d..5a6483fd4d2 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,11 @@ 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)'
+ 'NVARCHAR(MAX) COLLATE Latin1_General_CS_AS'
elsif %w( boolean date datetime ).include?(type.to_s)
super(type) # cannot specify limit/precision/scale with these types
+ elsif type.to_s == 'string'
+ super + ' COLLATE Latin1_General_CS_AS'
else
super
end