TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Make scoped reorder override previous applied orders

Browse Source 
[5528 state:committed]
This commit is contained in:
Santiago Pastorino 2010-09-04 23:59:40 -03:00
parent 16e078d908
commit 708ee9c5ac
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
activerecord/lib/active_record/relation/query_methods.rb
View File

@ -6,7 +6,7 @@ module QueryMethods
extend ActiveSupport::Concern
attr_accessor :includes_values, :eager_load_values, :preload_values,
:select_values, :group_values, :order_values, :joins_values, :where_values, :having_values,
:select_values, :group_values, :order_values, :reorder_flag, :joins_values, :where_values, :having_values,
:limit_value, :offset_value, :lock_value, :readonly_value, :create_with_value, :from_value
def includes(*args)
@ -53,7 +53,10 @@ def order(*args)
def reorder(*args)
relation = clone
relation.order_values = args if args.present?
if args.present?
relation.order_values = args
relation.reorder_flag = true
end
relation
end

11
activerecord/lib/active_record/relation/spawn_methods.rb
View File

@ -18,11 +18,20 @@ def merge(r)
end
end
(Relation::MULTI_VALUE_METHODS - [:joins, :where]).each do |method|
(Relation::MULTI_VALUE_METHODS - [:joins, :where, :order]).each do |method|
value = r.send(:"#{method}_values")
merged_relation.send(:"#{method}_values=", merged_relation.send(:"#{method}_values") + value) if value.present?
end
order_value = r.order_values
if order_value.present?
if r.reorder_flag
merged_relation.order_values = order_value
else
merged_relation.order_values = merged_relation.order_values + order_value
end
end
merged_relation = merged_relation.joins(r.joins_values)
merged_wheres = @where_values