diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-04-22 17:25:17 -0500 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-04-22 17:25:17 -0500 |
| commit | ba84bd933a484e5d365dcf52c9af24ec3937f602 (patch) | |
| tree | 798a17bea2db1a02a68fb3dc464ff6daf77579bb /activerecord/lib/active_record/relation/query_methods.rb | |
| parent | c26a690b9964d90eea33f33a513ae9c349678cc0 (diff) | |
| parent | 70b377f4648403b6facbe29b10e179eb649327a9 (diff) | |
| download | rails-ba84bd933a484e5d365dcf52c9af24ec3937f602.tar.gz rails-ba84bd933a484e5d365dcf52c9af24ec3937f602.tar.bz2 rails-ba84bd933a484e5d365dcf52c9af24ec3937f602.zip | |
Merge pull request #14757 from estsauver/14752
Fix behavior of select! to be consistent with select #14752
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 |