aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/relation
diff options
context:
space:
mode:
authorIan Lesperance <ilesperance@pivotallabs.com>2012-09-05 18:00:07 -0400
committerIan Lesperance <ilesperance@pivotallabs.com>2012-09-05 18:00:07 -0400
commitc7d752fe2f1ae79af648ccc1270d396355a18e94 (patch)
treeb45a2a862092ee40ec1e66318ac8f0058d61a08f /activerecord/lib/active_record/relation
parent1c8539da4738d51795422903b84f79705bc854cc (diff)
downloadrails-c7d752fe2f1ae79af648ccc1270d396355a18e94.tar.gz
rails-c7d752fe2f1ae79af648ccc1270d396355a18e94.tar.bz2
rails-c7d752fe2f1ae79af648ccc1270d396355a18e94.zip
Fix pluck when columns/tables are reserved words.
Diffstat (limited to 'activerecord/lib/active_record/relation')
-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