replica_pools 2.6.0 → 2.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca5913b321778c59730e29d5845c52cec3acc626ce4940e921fb40309ef3f39b
-  data.tar.gz: 89cbec0176c695013e1fa3691d02d004aa05bda88ccfcaf60c1452da06d7b9ac
+  metadata.gz: fe6224f74496648e6a90578eca09d572a1a76dc354787755be545e5b1e986655
+  data.tar.gz: 6b38d4c3366e1e3d73081522d77c7a4ff6742d7d08fb91341efb46b4001f916b
 SHA512:
-  metadata.gz: 6a99fc420ef83d2eee33302c0c50095a64c8c7f47c11471bc3310afb3557e22e64f6a6b4a288cd750b830c552cb9f6a3cc742e07c95ae9b1816a25f20d31b0c2
-  data.tar.gz: eb1e3a46c3e4bb83b5510f782f493e7490a8165bd5ea23952726d6d3e36bef7216811960254e87292a0628534ec06471aa442c56535b3a68cfaab2c9b471499a
+  metadata.gz: ee964bfeea8cfb1424649808d72bc606426f61d31e2310a4fbed5838de11a0731ee81a68098ec92194f938b3a4ce018e722f418bece8f6007f3437e0f335e59f
+  data.tar.gz: 7e5055af2da714269dfcd9ee50642438e4ec5a8b2c7036105945306bc594cee243e648478a2c979af33f9f992f956af96102903e6cd05414abe3309365a2b93e

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

@@ -34,28 +34,30 @@ 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
     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
+          configurations.configs_for(env_name: connection_name.to_s, include_hidden: true)
         end
       end)
 
@@ -63,5 +65,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.0"
+  VERSION = "2.6.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: replica_pools
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.2
 platform: ruby
 authors:
 - Dan Drabik
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-23 00:00:00.000000000 Z
+date: 2023-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord