Relation#Merger
can merge all clause methods
This will make it easy to add `having_clause` and `join_clause` later.
This commit is contained in:
parent
924127e21f
commit
b6a9c620aa
@ -50,7 +50,8 @@ def initialize(relation, other)
|
|||||||
end
|
end
|
||||||
|
|
||||||
NORMAL_VALUES = Relation::VALUE_METHODS -
|
NORMAL_VALUES = Relation::VALUE_METHODS -
|
||||||
[:joins, :where, :order, :reverse_order, :lock, :create_with, :reordering, :from] # :nodoc:
|
Relation::CLAUSE_METHODS -
|
||||||
|
[:joins, :order, :reverse_order, :lock, :create_with, :reordering, :from] # :nodoc:
|
||||||
|
|
||||||
def normal_values
|
def normal_values
|
||||||
NORMAL_VALUES
|
NORMAL_VALUES
|
||||||
@ -74,6 +75,7 @@ def merge
|
|||||||
|
|
||||||
merge_multi_values
|
merge_multi_values
|
||||||
merge_single_values
|
merge_single_values
|
||||||
|
merge_clauses
|
||||||
merge_joins
|
merge_joins
|
||||||
|
|
||||||
relation
|
relation
|
||||||
@ -106,8 +108,6 @@ def merge_joins
|
|||||||
end
|
end
|
||||||
|
|
||||||
def merge_multi_values
|
def merge_multi_values
|
||||||
relation.where_clause = relation.where_clause.merge(other.where_clause)
|
|
||||||
|
|
||||||
if other.reordering_value
|
if other.reordering_value
|
||||||
# override any order specified in the original relation
|
# override any order specified in the original relation
|
||||||
relation.reorder! other.order_values
|
relation.reorder! other.order_values
|
||||||
@ -127,6 +127,14 @@ def merge_single_values
|
|||||||
relation.create_with_value = (relation.create_with_value || {}).merge(other.create_with_value)
|
relation.create_with_value = (relation.create_with_value || {}).merge(other.create_with_value)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def merge_clauses
|
||||||
|
CLAUSE_METHODS.each do |name|
|
||||||
|
clause = relation.send("#{name}_clause")
|
||||||
|
other_clause = other.send("#{name}_clause")
|
||||||
|
relation.send("#{name}_clause=", clause.merge(other_clause))
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user