From 0df27c98d982ec87d2fb48cfda82694eb267993e Mon Sep 17 00:00:00 2001
From: Joshua Wehner <joshua.wehner@gmail.com>
Date: Wed, 31 Aug 2011 15:04:41 -0400
Subject: Fixes bug in ActiveRecord::QueryMethods, #1697

Replace split on comma with a regexp that will reverse all ASC/DESC specifically
---
 activerecord/lib/active_record/relation/query_methods.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'activerecord/lib')

diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index 7eda9ad8e8..355540782f 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -305,10 +305,8 @@ module ActiveRecord
         when Arel::Nodes::Ordering
           o.reverse
         when String, Symbol
-          o.to_s.split(',').collect do |s|
-            s.strip!
-            s.gsub!(/\sasc\Z/i, ' DESC') || s.gsub!(/\sdesc\Z/i, ' ASC') || s.concat(' DESC')
-          end
+          s = o.to_s.gsub(/\s((desc)|(asc))\s*(,|\Z)/i) { |m| " #{$2 ? 'ASC' : 'DESC'}#{$4}" }
+          s.match(/\s(de|a)sc\Z/i) ? s : s.concat(" DESC")
         else
           o
         end
-- 
cgit v1.2.3