replica_pools 2.6.5 → 2.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b62c1fdfa43f03f4975da35af83d63cb2360d8bc03002b2bdf5cc5b43aa58464
-  data.tar.gz: 5f766b1de70aa92fd797205f4cc88957c124ad932bd9624baf9d32cd706d95ed
+  metadata.gz: 3ea5f09fa92639eed7f9b4ca9cfd8f2d0e0ed4fb7448c0c2a9cbd85405efb890
+  data.tar.gz: ae4de86f30747a71de0962504a84aaed5c383b8d5b2618143256f666cc829f94
 SHA512:
-  metadata.gz: 2a9e40f9f6ef48d1b9aa8a9886ceb1c04e9e64a655d8c97ee4ca471236211c9a741200e0ac32a3e63dbc73c7851a1441469d3f1f33a447aa2ebdda9dcac1f5af
-  data.tar.gz: 845206307c7ab96d873e4ff191092d1d7f3841d5332008a0c13177abf23bf24bf568e78b71b36e652c6cb2a0d1849a6b469fc42bb4e2c1ac5ba9377f8c03ecb6
+  metadata.gz: 489ba3598de82b85a43d33b9f9b65630be4983926f084f18ee9a3fdcb5fadd963bd6870352dd7fd8bba490fd12503006b21e9578fc6ad33254ef745921efd8ca
+  data.tar.gz: 9d177b1e2bf10b36b0008820e8d8045853bf975d47a1b767ecb28bb77993991ec9d8b16de7ba653ecd1aede3d482317db9b52537c074372a0fcd0864d2992f86

data/lib/replica_pools/pools.rb

@@ -53,22 +53,24 @@ 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_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)
+
+      unless ReplicaPools.const_defined?(class_name)
+        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_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
-      end)
+        end)
+      end
 
       ReplicaPools.const_get(class_name).tap do |c|
         c.establish_connection(connection_name.to_sym)
       end
     end
-
   end
 end

data/lib/replica_pools/query_cache.rb

@@ -18,29 +18,20 @@ module ReplicaPools
     # select_all is trickier. it needs to use the leader
     # connection for cache logic, but ultimately pass its query
     # through to whatever connection is current.
-    def select_all(*args, **kwargs)
-      relation, name, raw_binds = args
-
-      if !query_cache_enabled || locked?(relation)
-        return route_to(current, :select_all, *args, **kwargs)
+    def select_all(arel, name = nil, binds = [], *args, preparable: nil, **kwargs)
+      if !query_cache_enabled || locked?(arel)
+        return route_to(current, :select_all, arel, name, binds, *args, preparable: preparable, **kwargs)
       end
 
-      # duplicate binds_from_relation behavior introduced in 4.2.
-      if raw_binds.blank? && relation.is_a?(ActiveRecord::Relation)
-        arel, binds = relation.arel, relation.bind_values
-      else
-        arel, binds = relation, Array(raw_binds)
+      # duplicate arel_from_relation behavior introduced in 5.2.
+      if arel.is_a?(ActiveRecord::Relation)
+        arel = arel.arel
       end
 
-      sql = to_sql(arel, binds)
-
-      args[0] = sql
-      args[2] = binds
+      sql, binds, preparable = to_sql_and_binds(arel, binds, preparable)
 
-      if Gem::Version.new(ActiveRecord.version) < Gem::Version.new('5.1')
-        cache_sql(sql, binds) { route_to(current, :select_all, *args, **kwargs) }
-      else
-        cache_sql(sql, name, binds) { route_to(current, :select_all, *args, **kwargs) }
+      cache_sql(sql, name, binds) do
+        route_to(current, :select_all, arel, name, binds, *args, preparable: preparable, **kwargs)
       end
     end
 

data/lib/replica_pools/version.rb

@@ -1,3 +1,3 @@
 module ReplicaPools
-  VERSION = "2.6.5"
+  VERSION = "2.6.7"
 end

data/spec/query_cache_spec.rb

@@ -116,4 +116,16 @@ describe ReplicaPools::QueryCache do
       expect(TestModel.pluck(:id).count).to eql TestModel.all.count
     end
   end
+
+  describe '.ids regression test' do
+    it 'should work with query caching' do
+      TestModel.connection.enable_query_cache!
+      expect(TestModel.ids.count).to eql TestModel.all.count
+    end
+
+    it 'should work if query cache is not enabled' do
+      TestModel.connection.disable_query_cache!
+      expect(TestModel.ids.count).to eql TestModel.all.count
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -2,6 +2,8 @@ require 'rubygems'
 require 'bundler/setup'
 require 'logger'
 
+ENV['MYSQL_PORT'] ||= %x(docker compose port mysql 3306)[/\d+$/]
+
 module Rails
   def self.env
     ActiveSupport::StringInquirer.new("test")

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: replica_pools
 version: !ruby/object:Gem::Version
-  version: 2.6.5
+  version: 2.6.7
 platform: ruby
 authors:
 - Dan Drabik
 - Lance Ivy
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-08 00:00:00.000000000 Z
+date: 2024-05-15 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.4.19
+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