Merge pull request #7434 from frodsan/select_list_arguments

Model.select takes a variable list of arguments

2 files changed, 20 insertions, 11 deletions

diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index 8e6254f918..f6bacf4822 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -136,8 +136,8 @@ module ActiveRecord
     # Second: Modifies the SELECT statement for the query so that only certain
     # fields are retrieved:
     #
-    #   >> Model.select(:field)
-    #   => [#<Model field:value>]
+    #   Model.select(:field)
+    #   # => [#<Model field:value>]
     #
     # Although in the above example it looks as though this method returns an
     # array, it actually returns a relation object and can have other query
@@ -145,25 +145,26 @@ module ActiveRecord
     #
     # The argument to the method can also be an array of fields.
     #
-    #   >> Model.select([:field, :other_field, :and_one_more])
-    #   => [#<Model field: "value", other_field: "value", and_one_more: "value">]
+    #   Model.select(:field, :other_field, :and_one_more)
+    #   # => [#<Model field: "value", other_field: "value", and_one_more: "value">]
     #
     # Accessing attributes of an object that do not have fields retrieved by a select
     # will throw <tt>ActiveModel::MissingAttributeError</tt>:
     #
-    #   >> Model.select(:field).first.other_field
-    #   => ActiveModel::MissingAttributeError: missing attribute: other_field
-    def select(value = Proc.new)
+    #   Model.select(:field).first.other_field
+    #   # => ActiveModel::MissingAttributeError: missing attribute: other_field
+    def select(*fields)
       if block_given?
-        to_a.select { |*block_args| value.call(*block_args) }
+        to_a.select { |*block_args| yield(*block_args) }
       else
-        spawn.select!(value)
+        raise ArgumentError, 'Call this with at least one field' if fields.empty?
+        spawn.select!(*fields)
       end
     end
 
     # Like #select, but modifies relation in place.
-    def select!(value)
-      self.select_values += Array.wrap(value)
+    def select!(*fields)
+      self.select_values += fields.flatten
       self
     end
 
diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index 684538940a..b91423351e 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -656,6 +656,14 @@ class RelationTest < ActiveRecord::TestCase
     assert_raises(ActiveRecord::ActiveRecordError) { Author.limit(10).delete_all }
   end
 
+  def test_select_takes_a_variable_list_of_args
+    david = developers(:david)
+
+    developer = Developer.where(id: david.id).select(:name, :salary).first
+    assert_equal david.name, developer.name
+    assert_equal david.salary, developer.salary
+  end
+
   def test_select_argument_error
     assert_raises(ArgumentError) { Developer.select }
   end