ActiveRecord::Base.all returns a Relation.

Previously it returned an Array.

If you want an array, call e.g. `Post.to_a` rather than `Post.all`. This
is more explicit.

In most cases this should not break existing code, since
Relations use method_missing to delegate unknown methods to #to_a
anyway.

1 files changed, 8 insertions, 11 deletions

diff --git a/activerecord/lib/active_record/scoping/named.rb b/activerecord/lib/active_record/scoping/named.rb
index 2af476c1ba..54de30fe7d 100644
--- a/activerecord/lib/active_record/scoping/named.rb
+++ b/activerecord/lib/active_record/scoping/named.rb
@@ -12,33 +12,30 @@ module ActiveRecord
       extend ActiveSupport::Concern
 
       module ClassMethods
-        # Returns an anonymous \scope.
+        # Returns an <tt>ActiveRecord::Relation</tt> scope object.
         #
-        #   posts = Post.scoped
+        #   posts = Post.all
         #   posts.size # Fires "select count(*) from  posts" and returns the count
         #   posts.each {|p| puts p.name } # Fires "select * from posts" and loads post objects
         #
-        #   fruits = Fruit.scoped
+        #   fruits = Fruit.all
         #   fruits = fruits.where(:color => 'red') if options[:red_only]
         #   fruits = fruits.limit(10) if limited?
         #
-        # Anonymous \scopes tend to be useful when procedurally generating complex
-        # queries, where passing intermediate values (\scopes) around as first-class
-        # objects is convenient.
-        #
         # You can define a \scope that applies to all finders using
         # ActiveRecord::Base.default_scope.
-        def scoped(options = nil)
+        def all
           if current_scope
-            scope = current_scope.clone
+            current_scope.clone
           else
             scope = relation
             scope.default_scoped = true
             scope
           end
+        end
 
-          scope.merge!(options) if options
-          scope
+        def scoped(options = nil)
+          options ? all.merge!(options) : all
         end
 
         ##