Changeset 7406

Timestamp:

09/04/07 17:32:48 (3 years ago)

Author:

rick

Message:

Fix bug where unserializing an attribute attempts to modify a frozen @attributes hash for a deleted record. [Rick]

Files:

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

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Fix bug where unserializing an attribute attempts to modify a frozen @attributes hash for a deleted record.  [Rick]
-
-* Performance: absorb instantiate and initialize_with_callbacks into the Base methods. [Jeremy Kemper]

trunk/activerecord/lib/active_record/attribute_methods.rb

@@ -208 +208 @@
-
-      if unserialized_object.is_a?(self.class.serialized_attributes[attr_name]) || unserialized_object.nil?
-
+.frozen? ? unserialized_object : @attributes
-      else
-        raise SerializationTypeMismatch,

trunk/activerecord/test/attribute_methods_test.rb

@@ -1 +1 @@
-require 'abstract_unit'
+require 'fixtures/topic'
-
-class AttributeMethodsTest < Test::Unit::TestCase
@@ -47 +48 @@
-    end
-  end
+  
+  def test_should_unserialize_attributes_for_frozen_records
+    myobj = {:value1 => :value2}
+    topic = Topic.create("content" => myobj)
+    topic.freeze
+    assert_equal myobj, topic.content
+    
+  end
-end