From 4c0a9922d6bc608e330740b4384c418fe69fc587 Mon Sep 17 00:00:00 2001 From: Sean Griffin Date: Sat, 24 Jan 2015 18:49:49 -0700 Subject: Don't duplicate `Relation::VALUE_METHODS` in `Relation::Merger` --- activerecord/lib/active_record/relation/merger.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/relation/merger.rb b/activerecord/lib/active_record/relation/merger.rb index afb0b208c3..4ee37be6be 100644 --- a/activerecord/lib/active_record/relation/merger.rb +++ b/activerecord/lib/active_record/relation/merger.rb @@ -49,8 +49,7 @@ module ActiveRecord @other = other end - NORMAL_VALUES = Relation::SINGLE_VALUE_METHODS + - Relation::MULTI_VALUE_METHODS - + NORMAL_VALUES = Relation::VALUE_METHODS - [:joins, :where, :order, :bind, :reverse_order, :lock, :create_with, :reordering, :from] # :nodoc: def normal_values -- cgit v1.2.3