Merge pull request #160 from rails/latest-rails-cache-behavior

Latest Rails cache behavior

.github/workflows/main.yml

@@ -28,7 +28,7 @@ jobs:
       fail-fast: false
       matrix:
         ruby-version: ["3.0", "3.1", "3.2", "3.3"]
-        gemfile: [ rails_7, rails_7_1, rails_main ]
+        gemfile: [ rails_7_1, rails_main ]
         database: [sqlite, postgres, mysql]
         exclude:
         - ruby-version: "3.0"

Appraisals

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-appraise "rails-7" do
-  gem "railties", github: "rails/rails", branch: "7-0-stable"
-end
-
 appraise "rails-7-1" do
   gem "railties", github: "rails/rails", branch: "7-1-stable"
 end

Gemfile.lock

@@ -2,9 +2,9 @@ PATH
   remote: .
   specs:
     solid_cache (0.5.3)
-      activejob (>= 7)
-      activerecord (>= 7)
-      railties (>= 7)
+      activejob (>= 7.1)
+      activerecord (>= 7.1)
+      railties (>= 7.1)
 
 GEM
   remote: https://rubygems.org/

app/models/solid_cache/entry.rb

@@ -31,7 +31,7 @@ def read_multi(keys)
       end
 
       def delete_by_key(key)
-        delete_no_query_cache(:key_hash, key_hash_for(key))
+        delete_no_query_cache(:key_hash, key_hash_for(key)) > 0
       end
 
       def delete_multi(keys)
@@ -47,21 +47,17 @@ def clear_delete
         in_batches.delete_all
       end
 
-      def increment(key, amount)
+      def lock_and_write(key, &block)
         transaction do
           uncached do
             result = lock.where(key_hash: key_hash_for(key)).pick(:key, :value)
-            amount += result[1].to_i if result&.first == key
-            write(key, amount)
-            amount
+            new_value = block.call(result&.first == key ? result[1] : nil)
+            write(key, new_value)
+            new_value
           end
         end
       end
 
-      def decrement(key, amount)
-        increment(key, -amount)
-      end
-
       def id_range
         uncached do
           pick(Arel.sql("max(id) - min(id) + 1")) || 0
@@ -152,9 +148,9 @@ def delete_no_query_cache(attribute, values)
 
             # exec_delete does not clear the query cache
             if connection.prepared_statements?
-              connection.exec_delete(sql, "#{name} Delete All", Array(values)).nonzero?
+              connection.exec_delete(sql, "#{name} Delete All", Array(values))
             else
-              connection.exec_delete(sql, "#{name} Delete All").nonzero?
+              connection.exec_delete(sql, "#{name} Delete All")
             end
           end
         end

gemfiles/rails_7_1.gemfile.lock

@@ -51,9 +51,9 @@ PATH
   remote: ..
   specs:
     solid_cache (0.5.3)
-      activejob (>= 7)
-      activerecord (>= 7)
-      railties (>= 7)
+      activejob (>= 7.1)
+      activerecord (>= 7.1)
+      railties (>= 7.1)
 
 GEM
   remote: https://rubygems.org/

gemfiles/rails_main.gemfile.lock

@@ -51,9 +51,9 @@ PATH
   remote: ..
   specs:
     solid_cache (0.5.3)
-      activejob (>= 7)
-      activerecord (>= 7)
-      railties (>= 7)
+      activejob (>= 7.1)
+      activerecord (>= 7.1)
+      railties (>= 7.1)
 
 GEM
   remote: https://rubygems.org/