From 5e6bee112a7d590cbc51934b768f9632814726ce Mon Sep 17 00:00:00 2001
From: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date: Sun, 4 Nov 2012 21:35:38 -0200
Subject: Use flat_map when building AR order

---
 activerecord/lib/active_record/relation/query_methods.rb | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'activerecord')

diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index 4fdc296c7e..0817bb6d81 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -218,7 +218,6 @@ module ActiveRecord
     # Like #order, but modifies relation in place.
     def order!(*args)
       args.flatten!
-
       validate_order_args args
 
       references = args.reject { |arg| Arel::Node === arg }
@@ -245,7 +244,6 @@ module ActiveRecord
     # Like #reorder, but modifies relation in place.
     def reorder!(*args)
       args.flatten!
-
       validate_order_args args
 
       self.reordering_value = true
@@ -796,7 +794,7 @@ module ActiveRecord
     def reverse_sql_order(order_query)
       order_query = ["#{quoted_table_name}.#{quoted_primary_key} ASC"] if order_query.empty?
 
-      order_query.map do |o|
+      order_query.flat_map do |o|
         case o
         when Arel::Nodes::Ordering
           o.reverse
@@ -814,7 +812,7 @@ module ActiveRecord
         else
           o
         end
-      end.flatten
+      end
     end
 
     def array_of_strings?(o)
@@ -825,7 +823,7 @@ module ActiveRecord
       orders = order_values
       orders = reverse_sql_order(orders) if reverse_order_value
 
-      orders = orders.uniq.reject(&:blank?).map do |order|
+      orders = orders.uniq.reject(&:blank?).flat_map do |order|
         case order
         when Symbol
           table[order].asc
@@ -834,7 +832,7 @@ module ActiveRecord
         else
           order
         end
-      end.flatten
+      end
 
       arel.order(*orders) unless orders.empty?
     end
-- 
cgit v1.2.3