Permalink
Browse files

Merge pull request #2271 from slawosz/enhance_select_method_api

allow select to have multiple arguments ie. Post.select(:id,:name,:author)
  • Loading branch information...
2 parents cfd086a + 04cc446 commit 89f3d8a886ee6d678b60b5e5df4d3a11d93c53d4 @drogus drogus committed Jul 26, 2011
Showing with 11 additions and 3 deletions.
  1. +6 −3 activerecord/lib/active_record/relation/query_methods.rb
  2. +5 −0 activerecord/test/cases/base_test.rb
@@ -37,12 +37,15 @@ def preload(*args)
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
@@ -123,6 +123,11 @@ def test_select_symbol
assert_equal Topic.all.map(&:id).sort, topic_ids
end
+ def test_select_symbol_for_many_arguments
+ topics = Topic.select(:id, :author_name).map{|topic| [topic.id, topic.author_name]}.sort
+ assert_equal Topic.all.map{|topic| [topic.id,topic.author_name]}.sort, topics
+ end
+
def test_table_exists
assert !NonExistentTable.table_exists?
assert Topic.table_exists?

0 comments on commit 89f3d8a

Please sign in to comment.