Merge pull request #2271 from slawosz/enhance_select_method_api

allow select to have multiple arguments ie. Post.select(:id,:name,:author)

1 files changed, 6 insertions, 3 deletions

diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index 1654ae1eac..792ffe1c5d 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -37,12 +37,15 @@ module ActiveRecord
       relation
     end
 
-    def select(value = Proc.new)
+    def select(*args, &blk)
+      if !block_given? && args.blank?
+        raise ArgumentError
+      end
       if block_given?
-        to_a.select {|*block_args| value.call(*block_args) }
+        to_a.select {|*block_args| blk.call(*block_args) }
       else
         relation = clone
-        relation.select_values += Array.wrap(value)
+        relation.select_values += args
         relation
       end
     end