diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2014-05-11 10:31:35 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2014-05-11 10:32:37 +0200 |
| commit | be5cb5c8b0ca18a6210900a65661cf3bce86bfe7 (patch) | |
| tree | 4e91801b2acbcba16d57c75e3ae888027173ee92 /sonar-server | |
| parent | b8c69356ebd33cb6651894db8aeb387e0ec0f683 (diff) | |
| download | sonarqube-be5cb5c8b0ca18a6210900a65661cf3bce86bfe7.tar.gz sonarqube-be5cb5c8b0ca18a6210900a65661cf3bce86bfe7.zip | |
SONAR-5280 fix compatibility with mysql 5.7.3
Diffstat (limited to 'sonar-server')
| -rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/mysql_adapter.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/mysql_adapter.rb b/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/mysql_adapter.rb index c50022bd89c..4c52720d212 100644 --- a/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/mysql_adapter.rb +++ b/sonar-server/src/main/webapp/WEB-INF/gems/gems/activerecord-2.3.15/lib/active_record/connection_adapters/mysql_adapter.rb @@ -182,7 +182,12 @@ module ActiveRecord QUOTED_TRUE, QUOTED_FALSE = '1'.freeze, '0'.freeze NATIVE_DATABASE_TYPES = { - :primary_key => "int(11) DEFAULT NULL auto_increment PRIMARY KEY".freeze, + # SonarQube + # Compatibility with mysql 5.7 + # See https://github.com/rails/rails/commit/26cea8fabe828e7b0535275044cb8316fff1c590 + #:primary_key => "int(11) DEFAULT NULL auto_increment PRIMARY KEY".freeze, + :primary_key => "int(11) auto_increment PRIMARY KEY".freeze, + # /SonarQube :string => { :name => "varchar", :limit => 255 }, :text => { :name => "text" }, :integer => { :name => "int", :limit => 4 }, |