0
@@ -2626,8 +2626,15 @@ module ActiveRecord #:nodoc:
0
         quoted = {}
0
         connection = self.class.connection
0
         attribute_names.each do |name|
0
-          if column = column_for_attribute(name)
0
-            quoted[name] = connection.quote(read_attribute(name), column) unless !include_primary_key && column.primary
0
+          if (column = column_for_attribute(name)) && (include_primary_key || !column.primary)
0
+            value = read_attribute(name)
0
+
0
+            # We need explicit to_yaml because quote() does not properly convert Time/Date fields to YAML.
0
+            if value && self.class.serialized_attributes.has_key?(name) && (value.acts_like?(:date) || value.acts_like?(:time))
0
+              value = value.to_yaml
0
+            end
0
+
0
+            quoted[name] = connection.quote(value, column)
0
           end
0
         end
0
         include_readonly_attributes ? quoted : remove_readonly_attributes(quoted)

0
@@ -1361,6 +1361,12 @@ class BasicsTest < ActiveRecord::TestCase
0
     assert_equal(myobj, topic.content)
0
   end
0
 
0
+  def test_serialized_time_attribute
0
+    myobj = Time.local(2008,1,1,1,0)
0
+    topic = Topic.create("content" => myobj).reload
0
+    assert_equal(myobj, topic.content)
0
+  end
0
+
0
   def test_nil_serialized_attribute_with_class_constraint
0
     myobj = MyObject.new('value1', 'value2')
0
     topic = Topic.new