From 32cb2345a54b9ab38461b2d4bb0dbd1706f2800e Mon Sep 17 00:00:00 2001 From: Tom Stuart Date: Mon, 17 Nov 2008 20:10:59 +0000 Subject: Fix default_scope to work in combination with named scopes Signed-off-by: David Heinemeier Hansson --- activerecord/test/models/developer.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'activerecord/test/models/developer.rb') diff --git a/activerecord/test/models/developer.rb b/activerecord/test/models/developer.rb index 0c20f97502..92039a4f54 100644 --- a/activerecord/test/models/developer.rb +++ b/activerecord/test/models/developer.rb @@ -79,13 +79,13 @@ class DeveloperWithBeforeDestroyRaise < ActiveRecord::Base end class DeveloperOrderedBySalary < ActiveRecord::Base - self.table_name = 'developers' - default_scope :order => "salary DESC" + self.table_name = 'developers' + default_scope :order => 'salary DESC' + named_scope :by_name, :order => 'name DESC' - def self.all_ordered_by_name - with_scope(:find => { :order => "name DESC" }) do - find(:all) - end + def self.all_ordered_by_name + with_scope(:find => { :order => 'name DESC' }) do + find(:all) end - + end end -- cgit v1.2.3