github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "allow select to have multiple arguments"

Browse Source 
This reverts commit 04cc446d17.

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.
This commit is contained in:
Piotr Sarnacki
2011-07-26 16:12:17 +02:00
committed by Xavier Noria
parent e7f7439d06
commit 182a428418
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
activerecord/lib/active_record/relation/query_methods.rb
View File

@@ -37,15 +37,12 @@ module ActiveRecord
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

5
activerecord/test/cases/base_test.rb
View File

@@ -123,11 +123,6 @@ class BasicsTest < ActiveRecord::TestCase
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?