If a counter_cache exists, use it for #empty?

activerecord/lib/active_record/associations/has_many_association.rb

@@ -41,6 +41,14 @@ def insert_record(record, validate = true, raise = false)
         end
       end
 
+      def empty?
+        if has_cached_counter?
+          size.zero?
+        else
+          super
+        end
+      end
+
       private
 
         # Returns the number of records in this collection.

activerecord/test/cases/associations/has_many_associations_test.rb

@@ -807,6 +807,13 @@ def test_deleting_updates_counter_cache_with_dependent_destroy
     end
   end
 
+  def test_calling_empty_with_counter_cache
+    post = posts(:welcome)
+    assert_queries(0) do
+      assert_not post.comments.empty?
+    end
+  end
+
   def test_custom_named_counter_cache
     topic = topics(:first)