diff options
| author | Yasuo Honda <yasuo.honda@gmail.com> | 2018-09-13 23:23:09 +0000 |
|---|---|---|
| committer | Yasuo Honda <yasuo.honda@gmail.com> | 2018-09-14 00:19:36 +0000 |
| commit | 730b76b3ae9950b644b2a3e0a68840dd170d0377 (patch) | |
| tree | bc9b18ca3fbcdf41719fb6b1027bfc7f87402731 /railties | |
| parent | 7265b897805aee6b858fb72f5fc33e4622635dab (diff) | |
| download | rails-730b76b3ae9950b644b2a3e0a68840dd170d0377.tar.gz rails-730b76b3ae9950b644b2a3e0a68840dd170d0377.tar.bz2 rails-730b76b3ae9950b644b2a3e0a68840dd170d0377.zip | |
Remove mysql2 gem version requirement "< 0.6.0"
Suggested at https://github.com/rails/rails/pull/33876#issuecomment-421176221
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 2 | ||||
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index a6dc60342c..8991c547ca 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", "< 0.6.0"]] + when "mysql" then ["mysql2", [">= 0.4.4"]] when "postgresql" then ["pg", [">= 0.18", "< 2.0"]] when "oracle" then ["activerecord-oracle_enhanced-adapter", nil] when "frontbase" then ["ruby-frontbase", nil] diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index f33a7bd99d..14cdd8b5c9 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -492,7 +492,7 @@ class AppGeneratorTest < Rails::Generators::TestCase if defined?(JRUBY_VERSION) assert_gem "activerecord-jdbcmysql-adapter" else - assert_gem "mysql2", "'>= 0.4.4', '< 0.6.0'" + assert_gem "mysql2", "'>= 0.4.4'" end end |