Changeset 6879

Timestamp:

05/28/07 15:51:53 (1 year ago)

Author:

rick

Message:

Allow nil serialized attributes with a set class constraint. #7293 [sandofsky]

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/base.rb (modified) (2 diffs)
• trunk/activerecord/test/base_test.rb (modified) (1 diff)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Allow nil serialized attributes with a set class constraint.  #7293 [sandofsky]
-
-* Oracle: support binary fixtures.  #7987 [Michael Schoen]

trunk/activerecord/lib/active_record/base.rb

@@ -644 +644 @@
-      # Specifies that the attribute by the name of +attr_name+ should be serialized before saving to the database and unserialized
-      # after loading from the database. The serialization is done through YAML. If +class_name+ is specified, the serialized
- or
+, or nil. Otherwise,
-      def serialize(attr_name, class_name = Object)
-        serialized_attributes[attr_name.to_s] = class_name
@@ -2111 +2111 @@
-        unserialized_object = object_from_yaml(@attributes[attr_name])
-
-
+ || unserialized_object.nil?
-          @attributes[attr_name] = unserialized_object
-        else

trunk/activerecord/test/base_test.rb

@@ -1155 +1155 @@
-  end
-
+  def test_nil_serialized_attribute_with_class_constraint
+    myobj = MyObject.new('value1', 'value2')
+    topic = Topic.new
+    assert_nil topic.content
+  end
+
+  def test_should_raise_exception_on_serialized_attribute_with_type_mismatch
+    myobj = MyObject.new('value1', 'value2')
+    topic = Topic.new(:content => myobj)
+    assert topic.save
+    Topic.serialize(:content, Hash)
+    assert_raise(ActiveRecord::SerializationTypeMismatch) { Topic.find(topic.id).content }
+  ensure
+    Topic.serialize(:content)
+  end
+
-  def test_serialized_attribute_with_class_constraint
-
-
+
-    Topic.serialize(:content, Hash)
-
-
-
-
-
+
+
-    assert_equal(settings, Topic.find(topic.id).content)
+  ensure
-    Topic.serialize(:content)
-  end