Fix load_async for null relations

Fixes #50351
rails · Dec 13, 2023 · c755144 · c755144
1 parent ee65e97
commit c755144
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
@@ -960,7 +960,7 @@ def exec_queries(&block)
       def exec_main_query(async: false)
         if @none
           if async
-            return Promise::Complete.new([])
+            return FutureResult::Complete.new([])
           else
             return []
           end

diff --git a/activerecord/test/cases/relation/load_async_test.rb b/activerecord/test/cases/relation/load_async_test.rb
@@ -41,6 +41,18 @@ def test_scheduled?
       assert_not_predicate deferred_posts, :scheduled?
     end
 
+    def test_null_scheduled?
+      deferred_null_posts = Post.none.load_async
+      if in_memory_db?
+        assert_not_predicate deferred_null_posts, :scheduled?
+      else
+        assert_predicate deferred_null_posts, :scheduled?
+      end
+      assert_predicate deferred_null_posts, :loaded?
+      deferred_null_posts.to_a
+      assert_not_predicate deferred_null_posts, :scheduled?
+    end
+
     def test_reset
       deferred_posts = Post.where(author_id: 1).load_async
       if in_memory_db?