diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2018-03-22 02:58:57 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-22 02:58:57 +0900 |
| commit | 7e06d9cb2cf838a2ca0a7eb09d88824135ec2b5a (patch) | |
| tree | cb9b93f245946b39dc58feb3a13fb925963fcc2c | |
| parent | 627ef06331b5c6c30e6100bfdaa38dbeb18c037a (diff) | |
| parent | 9f5477af93d18e9644903f89bce4ffde13cc376e (diff) | |
| download | rails-7e06d9cb2cf838a2ca0a7eb09d88824135ec2b5a.tar.gz rails-7e06d9cb2cf838a2ca0a7eb09d88824135ec2b5a.tar.bz2 rails-7e06d9cb2cf838a2ca0a7eb09d88824135ec2b5a.zip | |
Merge pull request #32310 from sodabrew/mysql2-0.4-0.5
Support mysql2 0.4.x and 0.5.x
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb index bfdc7995f0..4c57bd48ab 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb @@ -3,7 +3,7 @@ require "active_record/connection_adapters/abstract_mysql_adapter" require "active_record/connection_adapters/mysql/database_statements" -gem "mysql2", "~> 0.4.4" +gem "mysql2", ">= 0.4.4", "< 0.6.0" require "mysql2" module ActiveRecord diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index e1889979d7..8c5d872573 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -299,7 +299,7 @@ module Rails def gem_for_database # %w( mysql postgresql sqlite3 oracle frontbase ibm_db sqlserver jdbcmysql jdbcsqlite3 jdbcpostgresql ) case options[:database] - when "mysql" then ["mysql2", ["~> 0.4.4"]] + when "mysql" then ["mysql2", [">= 0.4.4", "< 0.6.0"]] when "postgresql" then ["pg", [">= 0.18", "< 2.0"]] when "oracle" then ["activerecord-oracle_enhanced-adapter", nil] when "frontbase" then ["ruby-frontbase", nil] |