Use array of orders instead of string concatenation

rails · Jun 10, 2009 · af9f9dd · af9f9dd
1 parent 0587462
commit af9f9dd
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
@@ -1750,17 +1750,15 @@ def construct_group(group, having, scope = :auto)
         end
 
         def construct_order(order, scope = :auto)
-          sql = ''
+          orders = []
           scoped_order = scope[:order] if scope
           if order
-            sql << order.to_s
+            orders << order
-            if scoped_order && scoped_order != order
+            orders << scoped_order if scoped_order && scoped_order != order
-              sql << ", #{scoped_order}"
-            end
           else
-            sql << scoped_order.to_s if scoped_order
+            orders << scoped_order if scoped_order
           end
-          sql
+          orders
         end
 
         def construct_limit(options, scope = :auto)