From 730b76b3ae9950b644b2a3e0a68840dd170d0377 Mon Sep 17 00:00:00 2001
From: Yasuo Honda <yasuo.honda@gmail.com>
Date: Thu, 13 Sep 2018 23:23:09 +0000
Subject: [PATCH] Remove mysql2 gem version requirement "< 0.6.0"

Suggested at https://github.com/rails/rails/pull/33876#issuecomment-421176221
---
 .../lib/active_record/connection_adapters/mysql2_adapter.rb     | 2 +-
 railties/lib/rails/generators/app_base.rb                       | 2 +-
 railties/test/generators/app_generator_test.rb                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
index 92f15de219..10c8c8e8ab 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", "< 0.6.0"
+gem "mysql2", ">= 0.4.4"
 require "mysql2"
 
 module ActiveRecord
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 @@ 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", "< 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 @@ def test_config_mysql_database
     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
 
-- 
GitLab