Merge pull request #32310 from sodabrew/mysql2-0.4-0.5

Support mysql2 0.4.x and 0.5.x
rails · Mar 21, 2018 · 7e06d9c · 7e06d9c
2 parents 627ef06 + 9f5477a
commit 7e06d9c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -299,7 +299,7 @@ def rails_version_specifier(gem_version = Rails.gem_version)
       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]