Remove support for Rails 5.1

zendesk · Oct 12, 2023 · 947564c · 947564c
1 parent 00595f2
commit 947564c
Show file tree

Hide file tree

Showing 13 changed files with 10 additions and 108 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -44,7 +44,6 @@ jobs:
           - "false"
           - "true"
         include:
-          - {ruby-version: "2.7", gemfile: rails5.1, legacy_connection_handling: "false"}
           - {ruby-version: "2.7", gemfile: rails5.2, legacy_connection_handling: "false"}
           - {ruby-version: "2.7", gemfile: rails6.0, legacy_connection_handling: "false"}
     env:

diff --git a/Changelog.md b/Changelog.md
@@ -8,6 +8,7 @@ and as of v1.0.0 this project adheres to [Semantic Versioning](https://semver.or
 
 - `Trilogy` is now a supported MySQL database adapter. ActiveRecordHostPool no longer requires `mysql2`, nor does it explicitly require `activerecord-trilogy-adapter`. Applications using ARHP will now need to explicitly require one of these adapters in its gemfile. When using `activerecord-trilogy-adapter` also ensure that the `trilogy` gem is locked to `v2.5.0+`.
 - Remove `mysql2` as a direct dependency, test Rails 7.0 with `mysql2` and `activerecord-trilogy-adapter`.
+- Remove support for Rails 5.1.
 
 ## [1.2.5] - 2023-07-14
 ### Added

diff --git a/Gemfile b/Gemfile
@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-eval_gemfile 'gemfiles/rails5.1.gemfile'
+eval_gemfile 'gemfiles/rails5.2.gemfile'
diff --git a/active_record_host_pool.gemspec b/active_record_host_pool.gemspec
@@ -28,5 +28,5 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 2.7.0"
 
-  s.add_runtime_dependency("activerecord", ">= 5.1.0", "< 7.1")
+  s.add_runtime_dependency("activerecord", ">= 5.2.0", "< 7.1")
 end
diff --git a/gemfiles/rails5.1.gemfile b/gemfiles/rails5.1.gemfile
diff --git a/gemfiles/rails5.1.gemfile.lock b/gemfiles/rails5.1.gemfile.lock
diff --git a/gemfiles/rails5.2.gemfile.lock b/gemfiles/rails5.2.gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     active_record_host_pool (1.2.5)
-      activerecord (>= 5.1.0, < 7.1)
+      activerecord (>= 5.2.0, < 7.1)
 
 GEM
   remote: https://rubygems.org/

diff --git a/gemfiles/rails6.0.gemfile.lock b/gemfiles/rails6.0.gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     active_record_host_pool (1.2.5)
-      activerecord (>= 5.1.0, < 7.1)
+      activerecord (>= 5.2.0, < 7.1)
 
 GEM
   remote: https://rubygems.org/

diff --git a/gemfiles/rails6.1.gemfile.lock b/gemfiles/rails6.1.gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     active_record_host_pool (1.2.5)
-      activerecord (>= 5.1.0, < 7.1)
+      activerecord (>= 5.2.0, < 7.1)
 
 GEM
   remote: https://rubygems.org/

diff --git a/gemfiles/rails7.0_mysql2.gemfile.lock b/gemfiles/rails7.0_mysql2.gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     active_record_host_pool (1.2.5)
-      activerecord (>= 5.1.0, < 7.1)
+      activerecord (>= 5.2.0, < 7.1)
 
 GEM
   remote: https://rubygems.org/

diff --git a/gemfiles/rails7.0_trilogy.gemfile.lock b/gemfiles/rails7.0_trilogy.gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     active_record_host_pool (1.2.5)
-      activerecord (>= 5.1.0, < 7.1)
+      activerecord (>= 5.2.0, < 7.1)
 
 GEM
   remote: https://rubygems.org/

diff --git a/lib/active_record_host_pool/connection_adapter_mixin.rb b/lib/active_record_host_pool/connection_adapter_mixin.rb
@@ -112,7 +112,7 @@ class ConnectionHandler
 
         :noop
 
-      when '5.1', '5.2', '6.0'
+      when '5.2', '6.0'
 
         def establish_connection(spec)
           resolver = ConnectionAdapters::ConnectionSpecification::Resolver.new(Base.configurations)

diff --git a/test/test_arhp.rb b/test/test_arhp.rb
@@ -25,11 +25,7 @@ def test_process_forking_with_connections
 
     # Verify that when we fork, the process doesn't crash
     pid = Process.fork do
-      if ActiveRecord.version >= Gem::Version.new('5.2')
-        assert_equal(false, ActiveRecord::Base.connected?) # New to Rails 5.2
-      else
-        assert_equal(true, ActiveRecord::Base.connected?)
-      end
+      refute ActiveRecord::Base.connected?
     end
     Process.wait(pid)
     # Cleanup any connections we may have left around