From 1b699fc8ad0eaf3503ec095413866ec5e4794162 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 5 Mar 2013 11:33:16 -0800
Subject: 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
---
 activerecord/CHANGELOG.md                    | 15 ---------------
 activerecord/test/cases/calculations_test.rb |  6 ------
 2 files changed, 21 deletions(-)

(limited to 'activerecord')

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 123fa09055..ec017f8623 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,8 +1,3 @@
-## unreleased ##
-
-*   No changes.
-
-
 ## Rails 3.2.13 (Feb 17, 2013) ##
 
 *   Reverted 921a296a3390192a71abeec6d9a035cc6d1865c8, 'Quote numeric values
@@ -228,16 +223,6 @@
 
     *Victor Costan*
 
-*   `#pluck` can be used on a relation with `select` clause.
-    Fixes #7551.
-    Backport of #8176.
-
-    Example:
-
-        Topic.select([:approved, :id]).order(:id).pluck(:id)
-
-    *Yves Senn*
-
 *   Use `nil?` instead of `blank?` to check whether dynamic finder with a bang
     should raise RecordNotFound.
     Fixes #7238.
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)
-- 
cgit v1.2.3