aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorAaron Stone <aaron@serendipity.cx>2018-03-20 17:59:43 -0700
committerAaron Stone <aaron@serendipity.cx>2018-03-20 23:38:00 -0700
commit9f5477af93d18e9644903f89bce4ffde13cc376e (patch)
treea8c9e819dd652bc44defeeddad8d46648d2dd7b6 /railties/lib
parentfab6ded8f299d51593f4d68f4f9b7b03b44aa2c3 (diff)
downloadrails-9f5477af93d18e9644903f89bce4ffde13cc376e.tar.gz
rails-9f5477af93d18e9644903f89bce4ffde13cc376e.tar.bz2
rails-9f5477af93d18e9644903f89bce4ffde13cc376e.zip
Support mysql2 0.4.x and 0.5.x
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/generators/app_base.rb2
1 files changed, 1 insertions, 1 deletions
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]