replica_pools 2.3.1 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1af9dd473884c12967be5648f4ff8e1cc2a029544bb27a76f7166698215b45f5
-  data.tar.gz: be05c7e623ec0cae9b3d6841edb6a6e5de1ada29c79a5f11854fc98000e63f7e
+  metadata.gz: ab90e26beb7efb6b13dd59a067a1507207d657659cac075ee91d1364a652e476
+  data.tar.gz: 166edf9e559cc696d837f32c8558e31fc69e1b24708e4d6a543210317f7af5e2
 SHA512:
-  metadata.gz: 99628a0df9823b14dae7a3dd2bd7d8ecb8e0333827616e06a56a352024fe27b89e6521af6a06e7dda243c92884aeb75437c8faad573c9598b7468e0fac1a87e3
-  data.tar.gz: e2ea27e89f05990765bb7025508ed590030f86763a44066f4f4372ec4239a71718fa0267e87b1027b0d0fb4ef4282dee24d2d1ec594a51d593d24be93ea7552e
+  metadata.gz: bf7ec04c450f7338bb5aac3bb41784dd88b2d3e069423fc5fdfbe8f9d13657eb3e35180c5a52e18099a608effd6c57073c5b20af2150e2b20a6710a8eac4388b
+  data.tar.gz: 4dfb218fbf9136d536b218072c2bba6a06ccd2412403461b9bc19184e9ac1767b8d1af64b5c025532f08651dd3b2fb4d04beea3e6202ea0f901a856f2a8396db

data/lib/replica_pools/engine.rb

@@ -42,7 +42,7 @@ module ReplicaPools
             select_values
             verify!
           ]
-        elsif [5, 6].include?(ActiveRecord::VERSION::MAJOR)
+        elsif [5, 6, 7].include?(ActiveRecord::VERSION::MAJOR)
           %i[
            active?
            cacheable_query

data/lib/replica_pools/pools.rb

@@ -34,11 +34,14 @@ module ReplicaPools
     end
 
     def config_hash
-      if ActiveRecord::VERSION::MAJOR >= 6
-        # in Rails >= 6, `configurations` is an instance of ActiveRecord::DatabaseConfigurations
+      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
         # in Rails < 6, it's just a hash
         ActiveRecord::Base.configurations

data/lib/replica_pools/query_cache.rb

@@ -19,11 +19,8 @@ module ReplicaPools
     # connection for cache logic, but ultimately pass its query
     # through to whatever connection is current.
     def select_all(*args)
-      # there may be more args for Rails 5.0+, but we only care about arel, name, and binds for caching.
       relation, name, raw_binds = args
 
-      # Rails 6.2 breaks this method as locked? is no longer available
-      # https://github.com/kickstarter/replica_pools/issues/26
       if !query_cache_enabled || locked?(relation)
         return route_to(current, :select_all, *args)
       end
@@ -47,6 +44,14 @@ module ReplicaPools
       end
     end
 
+    # If arel is locked this is a SELECT ... FOR UPDATE or somesuch. Such
+    # queries should not be cached.
+    def locked?(arel)
+      # This method was copied from Rails 6.1, since it has been removed in 7.0
+      arel = arel.arel if arel.is_a?(ActiveRecord::Relation)
+      arel.respond_to?(:locked) && arel.locked
+    end
+
     # these can use the unsafe delegation built into ConnectionProxy
     # [:insert, :update, :delete]
   end

data/lib/replica_pools/version.rb

@@ -1,3 +1,3 @@
 module ReplicaPools
-  VERSION = "2.3.1"
+  VERSION = "2.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: replica_pools
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.1
 platform: ruby
 authors:
 - Dan Drabik
@@ -9,22 +9,28 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-13 00:00:00.000000000 Z
+date: 2023-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '6.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '6.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement