Make scoped reorder override previous applied orders
[5528 state:committed]
This commit is contained in:
parent
16e078d908
commit
708ee9c5ac
@ -6,7 +6,7 @@ module QueryMethods
|
|||||||
extend ActiveSupport::Concern
|
extend ActiveSupport::Concern
|
||||||
|
|
||||||
attr_accessor :includes_values, :eager_load_values, :preload_values,
|
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
|
:limit_value, :offset_value, :lock_value, :readonly_value, :create_with_value, :from_value
|
||||||
|
|
||||||
def includes(*args)
|
def includes(*args)
|
||||||
@ -53,7 +53,10 @@ def order(*args)
|
|||||||
|
|
||||||
def reorder(*args)
|
def reorder(*args)
|
||||||
relation = clone
|
relation = clone
|
||||||
relation.order_values = args if args.present?
|
if args.present?
|
||||||
|
relation.order_values = args
|
||||||
|
relation.reorder_flag = true
|
||||||
|
end
|
||||||
relation
|
relation
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -18,11 +18,20 @@ def merge(r)
|
|||||||
end
|
end
|
||||||
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")
|
value = r.send(:"#{method}_values")
|
||||||
merged_relation.send(:"#{method}_values=", merged_relation.send(:"#{method}_values") + value) if value.present?
|
merged_relation.send(:"#{method}_values=", merged_relation.send(:"#{method}_values") + value) if value.present?
|
||||||
end
|
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_relation = merged_relation.joins(r.joins_values)
|
||||||
|
|
||||||
merged_wheres = @where_values
|
merged_wheres = @where_values
|
||||||
|
Loading…
Reference in New Issue
Block a user