aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/models/developer.rb
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2010-08-31 19:17:05 +0100
committerPratik Naik <pratiknaik@gmail.com>2010-08-31 19:17:18 +0100
commitc07f0ae52ecf9a45116e1b6ab422e0af9f2c1ada (patch)
treeb2cfcb3e46777dc12e46dff14149ae3ad060f085 /activerecord/test/models/developer.rb
parent67a2b5ec1bf9e34df18763490e14089733e8c774 (diff)
downloadrails-c07f0ae52ecf9a45116e1b6ab422e0af9f2c1ada.tar.gz
rails-c07f0ae52ecf9a45116e1b6ab422e0af9f2c1ada.tar.bz2
rails-c07f0ae52ecf9a45116e1b6ab422e0af9f2c1ada.zip
Change relation merging to always append select, group and order values
Diffstat (limited to 'activerecord/test/models/developer.rb')
-rw-r--r--activerecord/test/models/developer.rb2
1 files changed, 1 insertions, 1 deletions
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