aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/CHANGELOG.md
diff options
context:
space:
mode:
authorIan Lesperance <ilesperance@pivotallabs.com>2012-09-05 18:00:07 -0400
committerYves Senn <yves.senn@oxon.ch>2013-01-23 15:17:33 +0100
commitb6d49312920c0b3163064e44ca45871c68136b1c (patch)
treee084e35799a51a65eafb7d7da91ec76c3323883b /activerecord/CHANGELOG.md
parent2a5d119b44b1099c939bbf71c99fec5883d05ef7 (diff)
downloadrails-b6d49312920c0b3163064e44ca45871c68136b1c.tar.gz
rails-b6d49312920c0b3163064e44ca45871c68136b1c.tar.bz2
rails-b6d49312920c0b3163064e44ca45871c68136b1c.zip
Fix pluck when columns/tables are reserved words.
Backport #7536 to fix #8968. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/relation/calculations.rb
Diffstat (limited to 'activerecord/CHANGELOG.md')
-rw-r--r--activerecord/CHANGELOG.md6
1 files changed, 6 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 96fcfa72c5..18b5813579 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,5 +1,11 @@
## Rails 3.2.12 (unreleased) ##
+* Fix `ActiveRecord::Relation#pluck` when columns or tables are reserved words.
+ Backport #7536.
+ Fix #8968.
+
+ *Ian Lesperance + Yves Senn + Kaspar Schiess*
+
* Don't run explain on slow queries for database adapters that don't support it.
Backport #6197.