aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/collection_association.rb
diff options
context:
space:
mode:
authorDan Erikson <derikson3@gmail.com>2013-04-08 00:41:16 -0600
committerDan Erikson <derikson3@gmail.com>2013-04-08 00:41:16 -0600
commita8ede3664055f33c102b3f229cf280b0bf69c540 (patch)
treec83e394dbdc279ba21c9d4d11ca243af24482feb /activerecord/lib/active_record/associations/collection_association.rb
parenta92814b001d93f8ef533e692011bbc8824841bf7 (diff)
downloadrails-a8ede3664055f33c102b3f229cf280b0bf69c540.tar.gz
rails-a8ede3664055f33c102b3f229cf280b0bf69c540.tar.bz2
rails-a8ede3664055f33c102b3f229cf280b0bf69c540.zip
Changed ActiveRecord::Associations::CollectionProxy#select to take multiple arguments.
This makes the arguments the same as ActiveRecord::QueryMethods::select.
Diffstat (limited to 'activerecord/lib/active_record/associations/collection_association.rb')
-rw-r--r--activerecord/lib/active_record/associations/collection_association.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/collection_association.rb b/activerecord/lib/active_record/associations/collection_association.rb
index 2a00ac1386..5b08d07425 100644
--- a/activerecord/lib/active_record/associations/collection_association.rb
+++ b/activerecord/lib/active_record/associations/collection_association.rb
@@ -67,11 +67,11 @@ module ActiveRecord
@target = []
end
- def select(select = nil)
+ def select(*fields)
if block_given?
load_target.select.each { |e| yield e }
else
- scope.select(select)
+ scope.select(*fields)
end
end