replica_pools 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca5913b321778c59730e29d5845c52cec3acc626ce4940e921fb40309ef3f39b
-  data.tar.gz: 89cbec0176c695013e1fa3691d02d004aa05bda88ccfcaf60c1452da06d7b9ac
+  metadata.gz: da0145ee587f2856d0ba448914437caf148e8825abc9e2b31a853e8c6585ffdb
+  data.tar.gz: 26ffb29f8c44dcaefa6f0ba16452ab4af4757c46e1f660d76f6e3906cc2edb06
 SHA512:
-  metadata.gz: 6a99fc420ef83d2eee33302c0c50095a64c8c7f47c11471bc3310afb3557e22e64f6a6b4a288cd750b830c552cb9f6a3cc742e07c95ae9b1816a25f20d31b0c2
-  data.tar.gz: eb1e3a46c3e4bb83b5510f782f493e7490a8165bd5ea23952726d6d3e36bef7216811960254e87292a0628534ec06471aa442c56535b3a68cfaab2c9b471499a
+  metadata.gz: 70883d9c60ccfc07230b262af71c476d2944321e371a6bbdc4ba873eefe17e49e9185ac1bae7a95b30f51f6874b2a8d313fe2b35dc3b9c3253918b590d8a5798
+  data.tar.gz: c47b4975d6bbc30e44602ed51a60ea9d827624b3dabf726ad54d21524691e8acbf78545d7b1afecf5322d5122fce2a908b0461a68f6411a0f16e058354356c64

data/lib/replica_pools/pools.rb

@@ -34,18 +34,20 @@ module ReplicaPools
     end
 
     def config_hash
-      if ActiveRecord::VERSION::MAJOR > 6
-        # in Rails = 7, ActiveRecord::Base.configurations.to_h has been deprecated
-        ActiveRecord::Base.configurations.configs_for.map do |c|
-          [c.env_name, c.configuration_hash.transform_keys(&:to_s)]
-        end.to_h
-      elsif ActiveRecord::VERSION::MAJOR == 6
-        # in Rails = 6, `configurations` is an instance of ActiveRecord::DatabaseConfigurations
-        ActiveRecord::Base.configurations.to_h
-      else
+      if ActiveRecord::VERSION::MAJOR < 6
         # in Rails < 6, it's just a hash
-        ActiveRecord::Base.configurations
+        return ActiveRecord::Base.configurations
       end
+
+      if ActiveRecord::VERSION::MAJOR == 6 && ActiveRecord::VERSION::MINOR < 1
+        # in Rails = 6.0, `configurations` is an instance of ActiveRecord::DatabaseConfigurations
+        return ActiveRecord::Base.configurations.to_h
+      end
+
+      # in Rails >= 6.1, ActiveRecord::Base.configurations.to_h has been deprecated
+      ActiveRecord::Base.configurations.configs_for.map do |c|
+        [c.env_name, c.configuration_hash.transform_keys(&:to_s)]
+      end.to_h
     end
 
     # generates a unique ActiveRecord::Base subclass for a single replica

data/lib/replica_pools/version.rb

@@ -1,3 +1,3 @@
 module ReplicaPools
-  VERSION = "2.6.0"
+  VERSION = "2.6.1"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: replica_pools
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Dan Drabik
 - Lance Ivy
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-23 00:00:00.000000000 Z
+date: 2023-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -143,7 +143,7 @@ homepage: https://github.com/kickstarter/replica_pools
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '1.2'
 requirements: []
 rubygems_version: 3.1.6
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Connection proxy for ActiveRecord for leader / replica setups.
 test_files: