diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-15 14:54:31 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-15 14:54:31 -0700 |
commit | 5c7633cd30a80e9cf747ff39798aea8c03f70420 (patch) | |
tree | da9378390da9aefbb3e0e7647296ded57f50d683 /activerecord/lib/active_record/null_relation.rb | |
parent | ee46f1d5d2a8825de2d4973fb0301f2d85986e73 (diff) | |
parent | f6e7e11ad28555860bb8a1bb362fa091f48cc81a (diff) | |
download | rails-5c7633cd30a80e9cf747ff39798aea8c03f70420.tar.gz rails-5c7633cd30a80e9cf747ff39798aea8c03f70420.tar.bz2 rails-5c7633cd30a80e9cf747ff39798aea8c03f70420.zip |
Merge branch 'master' into joindep
* master:
use the cached arel table
Fix typo in the changelog entry
Don't remove the select values to add they back again
Pluck on NullRelation accepts a list of columns
Conflicts:
activerecord/lib/active_record/relation/finder_methods.rb
Diffstat (limited to 'activerecord/lib/active_record/null_relation.rb')
-rw-r--r-- | activerecord/lib/active_record/null_relation.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/null_relation.rb b/activerecord/lib/active_record/null_relation.rb index 1f3d377e53..080b20134d 100644 --- a/activerecord/lib/active_record/null_relation.rb +++ b/activerecord/lib/active_record/null_relation.rb @@ -6,7 +6,7 @@ module ActiveRecord @records = [] end - def pluck(_column_name) + def pluck(*column_names) [] end |