5 files changed, 21 insertions, 3 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 68c43558fd..bdbb09a593 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## Rails 4.0.0 (unreleased) ##
 
+*   Fix `ActiveRecord::Relation#pluck` when columns or tables are reserved words.
+
+    *Ian Lesperance*
+
 *   Fix time column type casting for invalid time string values to correctly return nil.
 
     *Adam Meehan*
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
diff --git a/activerecord/test/cases/calculations_test.rb b/activerecord/test/cases/calculations_test.rb
index 40e712072f..6cb6c469d2 100644
--- a/activerecord/test/cases/calculations_test.rb
+++ b/activerecord/test/cases/calculations_test.rb
@@ -1,10 +1,11 @@
 require "cases/helper"
+require 'models/club'
 require 'models/company'
 require "models/contract"
-require 'models/topic'
 require 'models/edge'
-require 'models/club'
 require 'models/organization'
+require 'models/possession'
+require 'models/topic'
 
 Company.has_many :accounts
 
@@ -576,4 +577,10 @@ class CalculationsTest < ActiveRecord::TestCase
     assert_equal ["37signals", nil], companies_and_developers.first
     assert_equal ["test", 7], companies_and_developers.last
   end
+
+  def test_pluck_with_reserved_words
+    Possession.create!(:where => "Over There")
+
+    assert_equal ["Over There"], Possession.pluck(:where)
+  end
 end
diff --git a/activerecord/test/models/possession.rb b/activerecord/test/models/possession.rb
new file mode 100644
index 0000000000..ddf759113b
--- /dev/null
+++ b/activerecord/test/models/possession.rb
@@ -0,0 +1,3 @@
+class Possession < ActiveRecord::Base
+  self.table_name = 'having'
+end
diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb
index 007349ea87..b4e611cb09 100644
--- a/activerecord/test/schema/schema.rb
+++ b/activerecord/test/schema/schema.rb
@@ -285,6 +285,10 @@ ActiveRecord::Schema.define do
     t.string :info
   end
 
+  create_table :having, :force => true do |t|
+    t.string :where
+  end
+
   create_table :guids, :force => true do |t|
     t.column :key, :string
   end