Use already-loaded relation contents in #sole

Shopify · Jan 23, 2025 · 5e361bb · 5e361bb
1 parent d604976
commit 5e361bb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/activerecord/lib/active_record/relation/finder_methods.rb b/activerecord/lib/active_record/relation/finder_methods.rb
@@ -141,7 +141,7 @@ def take!
     #
     #   Product.where(["price = %?", price]).sole
     def sole
-      found, undesired = limit(2)
+      found, undesired = take(2)
 
       if found.nil?
         raise_record_not_found_exception!

diff --git a/activerecord/test/cases/finder_test.rb b/activerecord/test/cases/finder_test.rb
@@ -794,6 +794,15 @@ def test_sole_failing_many
     end
   end
 
+  def test_sole_on_loaded_relation
+    relation = Topic.where("title = 'The First Topic'").load
+    expected_topic = topics(:first)
+
+    assert_no_queries do
+      assert_equal expected_topic, relation.sole
+    end
+  end
+
   def test_first
     assert_equal topics(:second).title, Topic.where("title = 'The Second Topic of the day'").first.title
   end