kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Don't duplicate Relation::VALUE_METHODS in Relation::Merger

Browse source
This commit is contained in:
Sean Griffin 2015-01-24 18:49:49 -07:00
parent 01849a9749
commit 4c0a9922d6
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
activerecord/lib/active_record/relation/merger.rb
View file

@ -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