diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-04-07 16:31:14 -0500 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-04-07 16:31:14 -0500 |
| commit | 3f5eb59f7a48aa5c08efb8db6cb41cd395c990af (patch) | |
| tree | a9a8340b86720ac0082158e486e1335a4b9e60e2 /activerecord/lib | |
| parent | 9575c820974b862a19dca1fcff54300b166e9a9c (diff) | |
| parent | 6c311e0b7538e8c55797aa889fdf66780ab283a4 (diff) | |
| download | rails-3f5eb59f7a48aa5c08efb8db6cb41cd395c990af.tar.gz rails-3f5eb59f7a48aa5c08efb8db6cb41cd395c990af.tar.bz2 rails-3f5eb59f7a48aa5c08efb8db6cb41cd395c990af.zip | |
Merge pull request #14634 from laurocaetano/fix_reorder
Build the reverse_order on its proper method.
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/relation/merger.rb | 1 | ||||
| -rw-r--r-- | activerecord/lib/active_record/relation/query_methods.rb | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/relation/merger.rb b/activerecord/lib/active_record/relation/merger.rb index 182b9ed89c..be44fccad5 100644 --- a/activerecord/lib/active_record/relation/merger.rb +++ b/activerecord/lib/active_record/relation/merger.rb @@ -139,7 +139,6 @@ module ActiveRecord def merge_single_values relation.from_value = values[:from] unless relation.from_value relation.lock_value = values[:lock] unless relation.lock_value - relation.reverse_order_value = values[:reverse_order] unless values[:create_with].blank? relation.create_with_value = (relation.create_with_value || {}).merge(values[:create_with]) diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb index 0213bca981..4287304945 100644 --- a/activerecord/lib/active_record/relation/query_methods.rb +++ b/activerecord/lib/active_record/relation/query_methods.rb @@ -825,7 +825,9 @@ module ActiveRecord end def reverse_order! # :nodoc: - self.reverse_order_value = !reverse_order_value + orders = order_values.uniq + orders.reject!(&:blank?) + self.order_values = reverse_sql_order(orders) self end @@ -871,7 +873,6 @@ module ActiveRecord case scope when :order - self.reverse_order_value = false result = [] else result = [] unless single_val_method @@ -1031,7 +1032,6 @@ module ActiveRecord def build_order(arel) orders = order_values.uniq orders.reject!(&:blank?) - orders = reverse_sql_order(orders) if reverse_order_value arel.order(*orders) unless orders.empty? end |