Un-deprecate using 'default_scope' as a macro, but if you are calling the macro multiple times that will give deprecation warnings, and in 3.2 we will simply overwrite the default scope when you call the macro multiple times.

1 files changed, 16 insertions, 52 deletions

diff --git a/activerecord/test/models/developer.rb b/activerecord/test/models/developer.rb
index 10385ba899..93363f47c5 100644
--- a/activerecord/test/models/developer.rb
+++ b/activerecord/test/models/developer.rb
@@ -86,10 +86,7 @@ end
 
 class DeveloperOrderedBySalary < ActiveRecord::Base
   self.table_name = 'developers'
-
-  def self.default_scope
-    order('salary DESC')
-  end
+  default_scope :order => 'salary DESC'
 
   scope :by_name, order('name DESC')
 
@@ -102,74 +99,41 @@ end
 
 class DeveloperCalledDavid < ActiveRecord::Base
   self.table_name = 'developers'
-
-  def self.default_scope
-    where "name = 'David'"
-  end
+  default_scope where("name = 'David'")
 end
 
-class DeveloperCalledJamis < ActiveRecord::Base
+class ClassMethodDeveloperCalledDavid < ActiveRecord::Base
   self.table_name = 'developers'
 
   def self.default_scope
-    where :name => 'Jamis'
+    where(:name => 'David')
   end
-
-  scope :poor, where('salary < 150000')
 end
 
-class AbstractDeveloperCalledJamis < ActiveRecord::Base
-  self.abstract_class = true
-
-  def self.default_scope
-    where :name => 'Jamis'
-  end
+class DeveloperCalledJamis < ActiveRecord::Base
+  self.table_name = 'developers'
+  default_scope where(:name => 'Jamis')
+  scope :poor, where('salary < 150000')
 end
 
 class PoorDeveloperCalledJamis < ActiveRecord::Base
   self.table_name = 'developers'
-
-  def self.default_scope
-    where :name => 'Jamis', :salary => 50000
-  end
+  default_scope where(:name => 'Jamis', :salary => 50000)
 end
 
 class InheritedPoorDeveloperCalledJamis < DeveloperCalledJamis
   self.table_name = 'developers'
 
-  def self.default_scope
-    super.where :salary => 50000
+  ActiveSupport::Deprecation.silence do
+    default_scope where(:salary => 50000)
   end
 end
 
-ActiveSupport::Deprecation.silence do
-  class DeprecatedDeveloperOrderedBySalary < ActiveRecord::Base
-    self.table_name = 'developers'
-    default_scope :order => 'salary DESC'
-
-    def self.by_name
-      order('name DESC')
-    end
-
-    def self.all_ordered_by_name
-      with_scope(:find => { :order => 'name DESC' }) do
-        find(:all)
-      end
-    end
-  end
-
-  class DeprecatedDeveloperCalledDavid < ActiveRecord::Base
-    self.table_name = 'developers'
-    default_scope :conditions => "name = 'David'"
-  end
-
-  class DeprecatedDeveloperCalledJamis < ActiveRecord::Base
-    self.table_name = 'developers'
-    default_scope :conditions => { :name => 'Jamis' }
-  end
+class MultiplePoorDeveloperCalledJamis < ActiveRecord::Base
+  self.table_name = 'developers'
+  default_scope where(:name => 'Jamis')
 
-  class DeprecatedPoorDeveloperCalledJamis < ActiveRecord::Base
-    self.table_name = 'developers'
-    default_scope :conditions => { :name => 'Jamis', :salary => 50000 }
+  ActiveSupport::Deprecation.silence do
+    default_scope where(:salary => 50000)
   end
 end