Merge pull request rails#43744 from martinjaimem/enhance/many-one

Enhance many? one?

Author: rafaelfranca

activerecord/lib/active_record/relation.rb

@@ -290,14 +290,14 @@ def any?
     # Returns true if there is exactly one record.
     def one?
       return super if block_given?
-      return records.one? if limit_value || loaded?
+      return records.one? if loaded?
       limited_count == 1
     end
 
     # Returns true if there is more than one record.
     def many?
       return super if block_given?
-      return records.many? if limit_value || loaded?
+      return records.many? if loaded?
       limited_count > 1
     end
 
@@ -974,7 +974,7 @@ def tables_in_string(string)
       end
 
       def limited_count
-        @limited_count ||= limit(2).count
+        @limited_count ||= limit_value ? count : limit(2).count
       end
   end
 end

activerecord/test/cases/relations_test.rb

@@ -1174,10 +1174,14 @@ def test_many
   end
 
   def test_many_with_limits
-    posts = Post.all
+    posts_with_limit = Post.limit(5)
+    posts_with_limit_one = Post.limit(1)
 
-    assert_predicate posts, :many?
-    assert_not_predicate posts.limit(1), :many?
+    assert_predicate posts_with_limit, :many?
+    assert_not_predicate posts_with_limit, :loaded?
+
+    assert_not_predicate posts_with_limit_one, :many?
+    assert_not_predicate posts_with_limit_one, :loaded?
   end
 
   def test_none?