aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2013-03-05 11:33:16 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2013-03-05 11:33:16 -0800
commit1b699fc8ad0eaf3503ec095413866ec5e4794162 (patch)
tree63d525838464ccaad4316bec15578f91e528b639 /activerecord/test
parentb5445247ad19ee0fb7f9a5ca31fd654cdaf6b005 (diff)
downloadrails-1b699fc8ad0eaf3503ec095413866ec5e4794162.tar.gz
rails-1b699fc8ad0eaf3503ec095413866ec5e4794162.tar.bz2
rails-1b699fc8ad0eaf3503ec095413866ec5e4794162.zip
Revert "Merge pull request #8209 from senny/backport_8176"
This reverts commit 724020278480855bddfe749c91f1074d4f50f3c6, reversing changes made to e4e2bcce75b85fb8c1c49509a17bd5dfe6034c32. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/relation/calculations.rb activerecord/test/cases/calculations_test.rb
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/cases/calculations_test.rb6
1 files changed, 0 insertions, 6 deletions
diff --git a/activerecord/test/cases/calculations_test.rb b/activerecord/test/cases/calculations_test.rb
index a1dc1de38d..67137d168b 100644
--- a/activerecord/test/cases/calculations_test.rb
+++ b/activerecord/test/cases/calculations_test.rb
@@ -493,12 +493,6 @@ class CalculationsTest < ActiveRecord::TestCase
assert_equal [1,2,3,4], Topic.order(:id).pluck("topics.id")
end
- def test_pluck_replaces_select_clause
- taks_relation = Topic.select([:approved, :id]).order(:id)
- assert_equal [1,2,3,4], taks_relation.pluck(:id)
- assert_equal [false, true, true, true], taks_relation.pluck(:approved)
- end
-
def test_pluck_auto_table_name_prefix
c = Company.create!(:name => "test", :contracts => [Contract.new])
assert_equal [c.id], Company.joins(:contracts).pluck(:id)