Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Revert "Merge pull request #8209 from senny/backport_8176"

This reverts commit 7240202, reversing
changes made to e4e2bcc.

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/relation/calculations.rb
	activerecord/test/cases/calculations_test.rb
  • Loading branch information...
commit 1b699fc8ad0eaf3503ec095413866ec5e4794162 1 parent b544524
Aaron Patterson tenderlove authored
15 activerecord/CHANGELOG.md
View
@@ -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.
6 activerecord/test/cases/calculations_test.rb
View
@@ -493,12 +493,6 @@ def test_pluck_with_qualified_column_name
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)
Please sign in to comment.
Something went wrong with that request. Please try again.