From b658cf1198bbeb0fb702cd10c6f491cd90cedba0 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Fri, 27 Jul 2012 17:27:47 +0100
Subject: Deprecate ActiveRecord::Base.scoped.

It doesn't serve much purpose now that ActiveRecord::Base.all returns a
Relation.

The code is moved to active_record_deprecated_finders.
---
 activerecord/lib/active_record/associations/association.rb         | 2 +-
 activerecord/lib/active_record/associations/collection_proxy.rb    | 6 +-----
 activerecord/lib/active_record/associations/through_association.rb | 2 +-
 activerecord/lib/active_record/relation/query_methods.rb           | 2 +-
 activerecord/lib/active_record/scoping/named.rb                    | 6 +-----
 5 files changed, 5 insertions(+), 13 deletions(-)

(limited to 'activerecord/lib')

diff --git a/activerecord/lib/active_record/associations/association.rb b/activerecord/lib/active_record/associations/association.rb
index 7db6d658f6..9e464ff681 100644
--- a/activerecord/lib/active_record/associations/association.rb
+++ b/activerecord/lib/active_record/associations/association.rb
@@ -118,7 +118,7 @@ module ActiveRecord
       # Can be overridden (i.e. in ThroughAssociation) to merge in other scopes (i.e. the
       # through association's scope)
       def target_scope
-        klass.scoped
+        klass.all
       end
 
       # Loads the \target if needed and returns it.
diff --git a/activerecord/lib/active_record/associations/collection_proxy.rb b/activerecord/lib/active_record/associations/collection_proxy.rb
index 2fb80fdc4c..49891f7675 100644
--- a/activerecord/lib/active_record/associations/collection_proxy.rb
+++ b/activerecord/lib/active_record/associations/collection_proxy.rb
@@ -896,13 +896,9 @@ module ActiveRecord
       end
 
       def spawn
-        scoped
-      end
-
-      def scoped(options = nil)
         association = @association
 
-        super.extending! do
+        @association.scoped.extending! do
           define_method(:proxy_association) { association }
         end
       end
diff --git a/activerecord/lib/active_record/associations/through_association.rb b/activerecord/lib/active_record/associations/through_association.rb
index be890e5767..b9e014735b 100644
--- a/activerecord/lib/active_record/associations/through_association.rb
+++ b/activerecord/lib/active_record/associations/through_association.rb
@@ -15,7 +15,7 @@ module ActiveRecord
           scope = super
           chain[1..-1].each do |reflection|
             scope = scope.merge(
-              reflection.klass.scoped.with_default_scope.
+              reflection.klass.all.with_default_scope.
                 except(:select, :create_with, :includes, :preload, :joins, :eager_load)
             )
           end
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index 9df63d5485..edde37446a 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -464,7 +464,7 @@ module ActiveRecord
     #   end
     #
     def none
-      scoped.extending(NullRelation)
+      extending(NullRelation)
     end
 
     # Sets readonly attributes for the returned relation. If value is
diff --git a/activerecord/lib/active_record/scoping/named.rb b/activerecord/lib/active_record/scoping/named.rb
index 54de30fe7d..4cd86cefe1 100644
--- a/activerecord/lib/active_record/scoping/named.rb
+++ b/activerecord/lib/active_record/scoping/named.rb
@@ -34,10 +34,6 @@ module ActiveRecord
           end
         end
 
-        def scoped(options = nil)
-          options ? all.merge!(options) : all
-        end
-
         ##
         # Collects attributes from scopes that should be applied when creating
         # an AR instance for the particular class this is called on.
@@ -186,7 +182,7 @@ module ActiveRecord
 
           singleton_class.send(:define_method, name) do |*args|
             options  = body.respond_to?(:call) ? unscoped { body.call(*args) } : body
-            relation = scoped.merge(options)
+            relation = all.merge(options)
 
             extension ? relation.extending(extension) : relation
           end
-- 
cgit v1.2.3