replica_pools 2.6.4 → 2.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fec69b8b572b701e6f50e555c91b38d9c166ee9ff2b1f9e1afff6b925483d224
-  data.tar.gz: 3be5fab5ae1aeb1609ac669fa85da3b0741b4eaa9f8066575b5f17c04d991590
+  metadata.gz: d922bbdd8ecbc6f8738bad680376d89886018b681fbfc7df10cc082ae3f475e4
+  data.tar.gz: 7d89312f16e3e172b10b7b08c63c8a11c546782d790ef3d7492992926a8cca3f
 SHA512:
-  metadata.gz: 507f274afcd27011fa4e40de581d59914423bfa3ff98398dcc744a56affe781b88d4aeecd3c22ca88419ef73752792fa25b791692d1f2d0b999c270509e68560
-  data.tar.gz: 5917987630ff6f7b2703223674df73590d3f60f54ea9e054966db3a4a30a5a3eaa063c785811bc97da45a55eff4d234e537ed7fc5505462f0eed2ede823fdec2
+  metadata.gz: 2dbcdf906d0dae7171c64e250b11805817595316ad6ce877214856c4b5be71594d218c16f1df99ed8c362db07a7b9981950e3f90d45e4d9238383c33cdec445f
+  data.tar.gz: ba7f78a5e3f0e4ca562232f914c161544aa51a1a873ab74eb37af4badf905e3000c7e4bd33f984bb9bfcf66879b94c763e165e33026c07bde2ddbdda94a07c50

data/README.md

@@ -173,21 +173,22 @@ Tests are run against MySQL 5.6 using docker-compose. 🐋
 
 To get set up, first run:
 
-```bash
-$ docker-compose up
-$ bundle install
-$ bundle exec rake bootstrap
-```
+    docker-compose up
+    bundle install
+    bundle exec rake bootstrap
 
 Then you can run tests with:
 
-```bash
-$ bundle exec rake spec
-```
+    bundle exec rake spec
 
 ## Releasing a New Version
 
-First bump the version as appropriate in `lib/replica_pools/version.rb` and then run `bundle exec rake release`. This will push git tags to github and package and push the gem to rubygems.org.
+Follow these steps to publish a new version to RubyGems:
+
+1. Increment the version in [lib/replica_pools/version.rb](./lib/replica_pools/version.rb). We follow [Semantic Versioning](http://semver.org).
+2. Push changes to GitHub
+3. Create a [new release](https://github.com/kickstarter/replica_pools/releases)
+4. Ensure the [Test and Release](https://github.com/kickstarter/replica_pools/actions/workflows/test-release.yml) GitHub Action succeeds in pushing a new gem to RubyGems
 
 ## Authors
 
@@ -203,10 +204,10 @@ Released under the MIT license
 
 The project is based on:
 
-- https://github.com/schoefmax/multi_db
+- [github.com/schoefmax/multi_db](https://github.com/schoefmax/multi_db)
 
 ### Masochism
 
 The original leader/replica plugin:
 
-- http://github.com/technoweenie/masochism
+- [github.com/technoweenie/masochism](http://github.com/technoweenie/masochism)

data/lib/replica_pools/connection_proxy.rb

@@ -100,7 +100,7 @@ module ReplicaPools
           end
         end
       end
-      send(method, *args, &block)
+      send(method, *args, **kwargs, &block)
     end
 
     def within_leader_block?
@@ -109,10 +109,7 @@ module ReplicaPools
 
     def route_to(conn, method, *args, **keyword_args, &block)
       raise ReplicaPools::LeaderDisabled.new if ReplicaPools.config.disable_leader && conn == leader
-      connection = conn.retrieve_connection
-
-      connection.verify!
-      connection.send(method, *args, **keyword_args, &block)
+      conn.retrieve_connection.send(method, *args, **keyword_args, &block)
     rescue => e
       ReplicaPools.log :error, "Error during ##{method}: #{e}"
       log_proxy_state

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.4"
+  VERSION = "2.6.6"
 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: replica_pools
 version: !ruby/object:Gem::Version
-  version: 2.6.4
+  version: 2.6.6
 platform: ruby
 authors:
 - Dan Drabik
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-05 00:00:00.000000000 Z
+date: 2024-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -158,14 +158,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '1.2'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.10
 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