Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Revert "allow select to have multiple arguments"

This reverts commit 04cc446.

I reverted it because apparently we want to use: select([:a, :b])
instead of select(:a, :b), but there was no tests for that form.
  • Loading branch information...
commit 182a4284183c63e9cb8fa879620ce01c98e111d3 1 parent e7f7439
@drogus drogus authored fxn committed
View
9 activerecord/lib/active_record/relation/query_methods.rb
@@ -37,15 +37,12 @@ def preload(*args)
relation
end
- def select(*args, &blk)
- if !block_given? && args.blank?
- raise ArgumentError
- end
+ def select(value = Proc.new)
if block_given?
- to_a.select {|*block_args| blk.call(*block_args) }
+ to_a.select {|*block_args| value.call(*block_args) }
else
relation = clone
- relation.select_values += args
+ relation.select_values += Array.wrap(value)
relation
end
end
View
5 activerecord/test/cases/base_test.rb
@@ -123,11 +123,6 @@ 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?
Please sign in to comment.
Something went wrong with that request. Please try again.