replica_pools 2.6.1 → 2.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da0145ee587f2856d0ba448914437caf148e8825abc9e2b31a853e8c6585ffdb
-  data.tar.gz: 26ffb29f8c44dcaefa6f0ba16452ab4af4757c46e1f660d76f6e3906cc2edb06
+  metadata.gz: e01d82e28f2d89abe76f89d880196de84b563e9b08401d94867828b5368a164d
+  data.tar.gz: cf5aa2ea0c91abaa27cd7fb2fdc99dbcd327188f3427572c8add0f13930cdf97
 SHA512:
-  metadata.gz: 70883d9c60ccfc07230b262af71c476d2944321e371a6bbdc4ba873eefe17e49e9185ac1bae7a95b30f51f6874b2a8d313fe2b35dc3b9c3253918b590d8a5798
-  data.tar.gz: c47b4975d6bbc30e44602ed51a60ea9d827624b3dabf726ad54d21524691e8acbf78545d7b1afecf5322d5122fce2a908b0461a68f6411a0f16e058354356c64
+  metadata.gz: eb6791fcbac25902d48092c5c6faa1cd60753419003ff9b3c957bce185e0c27fd9ec0db59653667bad7dee2247a242c232a4f30ebcbc67694d0657c4c16e25c8
+  data.tar.gz: ea3f61c5f4499437f74a28b81cddef31000c5d8323e81e53ebccef6d3d7d8501fd5537b469cc29a5c67a2c8bc58bec3057cde6ddef132ef17af53e50b966ccaf

data/lib/replica_pools/connection_proxy.rb

@@ -33,10 +33,16 @@ module ReplicaPools
       # this ivar is for ConnectionAdapter compatibility
       # some gems (e.g. newrelic_rpm) will actually use
       # instance_variable_get(:@config) to find it.
-      if ActiveRecord::VERSION::MAJOR >= 7
-        @config = current.connection_db_config
+      @config = current.send(ReplicaPools::ConnectionProxy.get_connection_config_method_name)
+    end
+
+    def self.get_connection_config_method_name
+      # 6.1 supports current.connection_config
+      # but warns of impending deprecation in 6.2
+      if ActiveRecord::VERSION::STRING.to_f >= 6.1
+        :connection_db_config
       else
-        @config = current.connection_config
+        :connection_config
       end
     end
 

data/lib/replica_pools/pools.rb

@@ -53,11 +53,15 @@ module ReplicaPools
     # generates a unique ActiveRecord::Base subclass for a single replica
     def connection_class(pool_name, replica_name, connection_name)
       class_name = "#{pool_name.camelize}#{replica_name.camelize}"
-
+      connection_config_method_name = ReplicaPools::ConnectionProxy.get_connection_config_method_name
       ReplicaPools.const_set(class_name, Class.new(ActiveRecord::Base) do |c|
         c.abstract_class = true
-        c.define_singleton_method(:connection_config) do
-          configurations.configs_for(connection_name.to_s)
+        c.define_singleton_method(connection_config_method_name) do
+          if ActiveRecord::VERSION::MAJOR == 6
+            configurations.configs_for(env_name: connection_name.to_s, include_replicas: true)
+          elsif ActiveRecord::VERSION::MAJOR == 7
+            configurations.configs_for(env_name: connection_name.to_s, include_hidden: true)
+          end
         end
       end)
 
@@ -65,5 +69,6 @@ module ReplicaPools
         c.establish_connection(connection_name.to_sym)
       end
     end
+
   end
 end

data/lib/replica_pools/version.rb

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: replica_pools
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.6.3
 platform: ruby
 authors:
 - Dan Drabik
 - Lance Ivy
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-13 00:00:00.000000000 Z
+date: 2023-06-28 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
@@ -158,14 +158,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '1.2'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: Connection proxy for ActiveRecord for leader / replica setups.
 test_files:
-- spec/spec_helper.rb
-- spec/pool_spec.rb
-- spec/slave_pools_spec.rb
 - spec/config/test_model.rb
-- spec/query_cache_spec.rb
 - spec/connection_proxy_spec.rb
+- spec/pool_spec.rb
+- spec/query_cache_spec.rb
+- spec/slave_pools_spec.rb
+- spec/spec_helper.rb