diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2016-05-10 16:47:53 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2016-05-10 18:44:40 +0200 |
| commit | 8813433bbee5e54f99224e3fb072019e894ae7d3 (patch) | |
| tree | 88908592ee86d7f416f7b78f5f90a21690a80b8c /server/sonar-web/src/main/webapp | |
| parent | 5e424b6e964cf798e7ecb674b2fff82d5fbebef4 (diff) | |
| download | sonarqube-8813433bbee5e54f99224e3fb072019e894ae7d3.tar.gz sonarqube-8813433bbee5e54f99224e3fb072019e894ae7d3.zip | |
SONAR-7627 Charset of SQLServer NVARCHAR columns is badly enforced to Latin1
Diffstat (limited to 'server/sonar-web/src/main/webapp')
2 files changed, 1 insertions, 36 deletions
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1002_fix_mssql_collation.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1002_fix_mssql_collation.rb deleted file mode 100644 index 8a98bad3de5..00000000000 --- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1002_fix_mssql_collation.rb +++ /dev/null @@ -1,33 +0,0 @@ -# -# SonarQube, open source software quality management tool. -# Copyright (C) 2008-2014 SonarSource -# mailto:contact AT sonarsource DOT com -# -# SonarQube is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 3 of the License, or (at your option) any later version. -# -# SonarQube is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# - -# -# SonarQube 5.3 -# SONAR-6884 -# -class FixMssqlCollation < ActiveRecord::Migration - - def self.up - execute_java_migration('org.sonar.db.version.v53.FixMsSqlCollation') - end - -end - - 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 5a6483fd4d2..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,11 +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" - 'NVARCHAR(MAX) COLLATE Latin1_General_CS_AS' + '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' - super + ' COLLATE Latin1_General_CS_AS' else super end |