kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Use same version constraint in mysql adapter and generated application

Browse source 
Follow up of 924a368f5c
This commit is contained in:
yuuji.yaginuma 2017-11-28 15:51:59 +09:00
parent 9aed61f52f
commit 349f00beaa
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
railties/lib/rails/generators/app_base.rb
View file

@ -297,7 +297,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.3.18", "< 0.5"]]
when "mysql" then ["mysql2", ["~> 0.4.4"]]
when "postgresql" then ["pg", ["~> 0.18"]]
when "oracle" then ["activerecord-oracle_enhanced-adapter", nil]
when "frontbase" then ["ruby-frontbase", nil]

2
railties/test/generators/app_generator_test.rb
View file

@ -404,7 +404,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
if defined?(JRUBY_VERSION)
assert_gem "activerecord-jdbcmysql-adapter"
else
assert_gem "mysql2", "'>= 0.3.18', '< 0.5'"
assert_gem "mysql2", "'~> 0.4.4'"
end
end