Merge pull request #50410 from fatkodima/fix-async-queries-with-query-cache

byroot · byroot · commit 9d1673853f13 · 2023-12-21T10:58:02.000+01:00
Fix async queries to work with query cache
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb b/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
@@ -102,7 +102,8 @@ def select_all(arel, name = nil, binds = [], preparable: nil, async: false)
           sql, binds, preparable = to_sql_and_binds(arel, binds, preparable)
 
           if async
-            lookup_sql_cache(sql, name, binds) || super(sql, name, binds, preparable: preparable, async: async)
+            result = lookup_sql_cache(sql, name, binds) || super(sql, name, binds, preparable: preparable, async: async)
+            FutureResult::Complete.new(result)
           else
             cache_sql(sql, name, binds) { super(sql, name, binds, preparable: preparable, async: async) }
           end
diff --git a/activerecord/test/cases/asynchronous_queries_test.rb b/activerecord/test/cases/asynchronous_queries_test.rb
@@ -48,7 +48,7 @@ def test_async_query_cache
 
     @connection.select_all "SELECT * FROM posts"
     result = @connection.select_all "SELECT * FROM posts", async: true
-    assert_equal ActiveRecord::Result, result.class
+    assert_equal ActiveRecord::FutureResult::Complete, result.class
   ensure
     ActiveRecord::Base.asynchronous_queries_tracker.finalize_session
     @connection.disable_query_cache!
diff --git a/activerecord/test/cases/calculations_test.rb b/activerecord/test/cases/calculations_test.rb
@@ -1034,6 +1034,13 @@ def test_calculation_with_polymorphic_relation
     assert_equal part.id, ShipPart.joins(:trinkets).sum(:id)
   end
 
+  def test_calculation_with_query_cache
+    ShipPart.cache do
+      count = ShipPart.count
+      assert_async_equal count, ShipPart.async_count
+    end
+  end
+
   def test_pluck_joined_with_polymorphic_relation
     part = ShipPart.create!(name: "has trinket")
     part.trinkets.create!
