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

Relation#Merger can merge all clause methods

Browse Source 
This will make it easy to add `having_clause` and `join_clause` later.
This commit is contained in:
Sean Griffin 2015-01-25 17:16:30 -07:00
parent 924127e21f
commit b6a9c620aa
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
activerecord/lib/active_record/relation/merger.rb
View File

@ -50,7 +50,8 @@ def initialize(relation, other)
end
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
NORMAL_VALUES
@ -74,6 +75,7 @@ def merge
merge_multi_values
merge_single_values
merge_clauses
merge_joins
relation
@ -106,8 +108,6 @@ def merge_joins
end
def merge_multi_values
relation.where_clause = relation.where_clause.merge(other.where_clause)
if other.reordering_value
# override any order specified in the original relation
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)
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