Merge pull request rails#54457 from skipkayhil/hm-retryable-query-cacheable

Enable query-cacheable queries to be retryable

Author: byroot

activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb

@@ -239,7 +239,7 @@ def select_all(arel, name = nil, binds = [], preparable: nil, async: false, allo
         # If arel is locked this is a SELECT ... FOR UPDATE or somesuch.
         # Such queries should not be cached.
         if @query_cache&.enabled? && !(arel.respond_to?(:locked) && arel.locked)
-          sql, binds, preparable, allow_retry = to_sql_and_binds(arel, binds, preparable)
+          sql, binds, preparable, allow_retry = to_sql_and_binds(arel, binds, preparable, allow_retry)
 
           if async
             result = lookup_sql_cache(sql, name, binds) || super(sql, name, binds, preparable: preparable, async: async, allow_retry: allow_retry)

activerecord/test/cases/adapter_test.rb

@@ -717,6 +717,27 @@ def teardown
         end
       end
 
+      test "query cacheable idempotent SELECT queries allow retries" do
+        @connection.enable_query_cache!
+
+        notifications = capture_notifications("sql.active_record") do
+          assert_not_nil (a = Author.first)
+          assert_not_nil Post.where(id: [1, 2]).first
+          assert_not_nil Post.find(1)
+          assert_not_nil Post.find_by(title: "Welcome to the weblog")
+          assert_predicate Post, :exists?
+          a.books.to_a
+        end.select { |n| n.payload[:name] != "SCHEMA" }
+
+        assert_equal 6, notifications.length
+
+        notifications.each do |n|
+          assert n.payload[:allow_retry], "#{n.payload[:sql]} was not retryable"
+        end
+      ensure
+        @connection.disable_query_cache!
+      end
+
       test "queries containing SQL fragments do not allow retries" do
         notifications = capture_notifications("sql.active_record") do
           Post.where("1 = 1").to_a