aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2011-07-06 14:33:14 -0700
committerJon Leighton <j@jonathanleighton.com>2011-07-06 14:33:14 -0700
commit689c3d674c34c0be6ec8dbadbb573b5b4abb6029 (patch)
tree8bbcb0f8155aed0128e4e7164be524fe255c0667
parentc713cf9a5d9db60c4387e74acb9de66e3e7f9b37 (diff)
parent2bdad7669c7a46e8c1362bd4d4e3c996496a6807 (diff)
downloadrails-689c3d674c34c0be6ec8dbadbb573b5b4abb6029.tar.gz
rails-689c3d674c34c0be6ec8dbadbb573b5b4abb6029.tar.bz2
rails-689c3d674c34c0be6ec8dbadbb573b5b4abb6029.zip
Merge pull request #1987 from ernie/fix_fix_to_reverse_sql_order
Remove case statement changes from 2e0840d and 56ac32a. Inheritance FTW.
-rw-r--r--activerecord/lib/active_record/relation/query_methods.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index ec2e4d4dcd..d17861f407 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -307,7 +307,7 @@ module ActiveRecord
order_query.map do |o|
case o
- when Arel::Nodes::Ascending, Arel::Nodes::Descending
+ when Arel::Nodes::Ordering
o.reverse
when String, Symbol
o.to_s.split(',').collect do |s|