0
@@ -103,7 +103,7 @@ module ActiveRecord
0
       attr_reader :proxy_scope, :proxy_options
0
 
0
       [].methods.each do |m|
0
-        unless m =~ /(^__|^nil\?|^send|^object_id$|class|extend|^find$|count|sum|average|maximum|minimum|paginate|first|last|empty\?|any\?|respond_to\?)/
0
+        unless m =~ /(^__|^nil\?|^send|^object_id$|class|extend|^find$|size|count|sum|average|maximum|minimum|paginate|first|last|empty\?|any\?|respond_to\?)/
0
           delegate m, :to => :proxy_found
0
         end
0
       end
0
@@ -136,6 +136,10 @@ module ActiveRecord
0
         end
0
       end
0
 
0
+      def size
0
+        @found ? @found.length : count
0
+      end
0
+
0
       def empty?
0
         @found ? @found.empty? : count.zero?
0
       end

0
@@ -256,4 +256,19 @@ class NamedScopeTest < ActiveRecord::TestCase
0
   def test_should_use_where_in_query_for_named_scope
0
     assert_equal Developer.find_all_by_name('Jamis'), Developer.find_all_by_id(Developer.jamises)
0
   end
0
+
0
+  def test_size_should_use_count_when_results_are_not_loaded
0
+    topics = Topic.base
0
+    assert_queries(1) do
0
+      topics.size # use count query
0
+    end
0
+  end
0
+
0
+  def test_size_should_use_length_when_results_are_loaded
0
+    topics = Topic.base
0
+    topics.reload # force load
0
+    assert_no_queries do
0
+      topics.size # use loaded (no query)
0
+    end
0
+  end
0
 end