Merge pull request #5362 from zenprogrammer/quoting_bug

Fixed bug in ActiveRecord that caused classes to be quoted incorrectly

2 files changed, 12 insertions, 0 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb b/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
index 44ac37c498..6f9f0399db 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
@@ -34,6 +34,7 @@ module ActiveRecord
         when Numeric    then value.to_s
         when Date, Time then "'#{quoted_date(value)}'"
         when Symbol     then "'#{quote_string(value.to_s)}'"
+        when Class      then "'#{value.to_s}'"
         else
           "'#{quote_string(YAML.dump(value))}'"
         end
diff --git a/activerecord/test/cases/connection_adapters/quoting_test.rb b/activerecord/test/cases/connection_adapters/quoting_test.rb
new file mode 100644
index 0000000000..f523cea9ca
--- /dev/null
+++ b/activerecord/test/cases/connection_adapters/quoting_test.rb
@@ -0,0 +1,11 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module Quoting
+      class QuotingTest < ActiveRecord::TestCase
+        def test_quoting_classes
+          assert_equal "'Object'", AbstractAdapter.new(nil).quote(Object)
+        end
+      end
+    end
+  end
+end
\ No newline at end of file