From c07f0ae52ecf9a45116e1b6ab422e0af9f2c1ada Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Tue, 31 Aug 2010 19:17:05 +0100
Subject: Change relation merging to always append select, group and order
 values

---
 activerecord/test/models/developer.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activerecord/test/models/developer.rb')

diff --git a/activerecord/test/models/developer.rb b/activerecord/test/models/developer.rb
index a140fb8e57..f0d40e741b 100644
--- a/activerecord/test/models/developer.rb
+++ b/activerecord/test/models/developer.rb
@@ -87,7 +87,7 @@ end
 class DeveloperOrderedBySalary < ActiveRecord::Base
   self.table_name = 'developers'
   default_scope :order => 'salary DESC'
-  scope :by_name, :order => 'name DESC'
+  scope :by_name, order('name DESC')
   scope :reordered_by_name, reorder('name DESC')
 
   def self.all_ordered_by_name
-- 
cgit v1.2.3