diff options
| author | Earl J St Sauver <estsauver@gmail.com> | 2014-04-15 21:43:24 -0700 |
|---|---|---|
| committer | Earl St Sauver <estsauver@gmail.com> | 2014-04-21 14:42:59 -0700 |
| commit | 70b377f4648403b6facbe29b10e179eb649327a9 (patch) | |
| tree | 2dad3b20025be364965b0893c9478915e2d1b3c2 /activerecord/lib/active_record/relation/query_methods.rb | |
| parent | 43f525031ad3f83a04f84e79bbe1de340bf937aa (diff) | |
| download | rails-70b377f4648403b6facbe29b10e179eb649327a9.tar.gz rails-70b377f4648403b6facbe29b10e179eb649327a9.tar.bz2 rails-70b377f4648403b6facbe29b10e179eb649327a9.zip | |
select! renamed to avoid name collision Array#select!
Fixes #14752
Select mimics the block interface of arrays, but does not mock the
block interface for select!. This change moves the api to be a
private method, _select!.
Diffstat (limited to 'activerecord/lib/active_record/relation/query_methods.rb')
| -rw-r--r-- | activerecord/lib/active_record/relation/query_methods.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb index 4287304945..5340fcb0b6 100644 --- a/activerecord/lib/active_record/relation/query_methods.rb +++ b/activerecord/lib/active_record/relation/query_methods.rb @@ -235,11 +235,11 @@ module ActiveRecord to_a.select { |*block_args| yield(*block_args) } else raise ArgumentError, 'Call this with at least one field' if fields.empty? - spawn.select!(*fields) + spawn._select!(*fields) end end - def select!(*fields) # :nodoc: + def _select!(*fields) # :nodoc: fields.flatten! fields.map! do |field| klass.attribute_alias?(field) ? klass.attribute_alias(field) : field |