aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/relation/calculations.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-09-05 15:30:01 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-09-05 15:30:01 -0700
commitebc4d8cede42b2e199a589904ceac6b4dc69eab5 (patch)
treea300672295a799cdb7d0014e3265d5c9f02bbe4d /activerecord/lib/active_record/relation/calculations.rb
parentfdcbc560ab155f82898e8894db4e566b78abfa37 (diff)
parentc7d752fe2f1ae79af648ccc1270d396355a18e94 (diff)
downloadrails-ebc4d8cede42b2e199a589904ceac6b4dc69eab5.tar.gz
rails-ebc4d8cede42b2e199a589904ceac6b4dc69eab5.tar.bz2
rails-ebc4d8cede42b2e199a589904ceac6b4dc69eab5.zip
Merge pull request #7536 from pivotal/fix_pluck_with_reserved_words
Fix pluck when columns/tables are reserved words.
Diffstat (limited to 'activerecord/lib/active_record/relation/calculations.rb')
-rw-r--r--activerecord/lib/active_record/relation/calculations.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/calculations.rb b/activerecord/lib/active_record/relation/calculations.rb
index d93e7c8997..7c43d844d0 100644
--- a/activerecord/lib/active_record/relation/calculations.rb
+++ b/activerecord/lib/active_record/relation/calculations.rb
@@ -156,7 +156,7 @@ module ActiveRecord
def pluck(*column_names)
column_names.map! do |column_name|
if column_name.is_a?(Symbol) && self.column_names.include?(column_name.to_s)
- "#{table_name}.#{column_name}"
+ "#{connection.quote_table_name(table_name)}.#{connection.quote_column_name(column_name)}"
else
column_name
end