aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/relation/merger.rb
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord/lib/active_record/relation/merger.rb')
-rw-r--r--activerecord/lib/active_record/relation/merger.rb11
1 files changed, 1 insertions, 10 deletions
diff --git a/activerecord/lib/active_record/relation/merger.rb b/activerecord/lib/active_record/relation/merger.rb
index 0a5e9ef171..1c2a06328f 100644
--- a/activerecord/lib/active_record/relation/merger.rb
+++ b/activerecord/lib/active_record/relation/merger.rb
@@ -17,16 +17,7 @@ module ActiveRecord
end
def merge
- HashMerger.new(relation, other_hash).merge
- end
-
- private
-
- def other_hash
- hash = {}
- Relation::MULTI_VALUE_METHODS.map { |name| hash[name] = other.send("#{name}_values") }
- Relation::SINGLE_VALUE_METHODS.map { |name| hash[name] = other.send("#{name}_value") }
- hash
+ HashMerger.new(relation, other.values).merge
end
end