Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix build when IM=true

  • Loading branch information...
commit 96c38eca23652ac40df26aac5dd48e214cb570cf 1 parent 5f2bfce
@jonleighton jonleighton authored committed
Showing with 3 additions and 4 deletions.
  1. +3 −4 activerecord/lib/active_record/identity_map.rb
View
7 activerecord/lib/active_record/identity_map.rb
@@ -111,13 +111,12 @@ def clear
# model object.
def reinit_with(coder)
@attributes_cache = {}
- dirty = @changed_attributes.keys
- @attributes.update(coder['attributes'].except(*dirty))
+ dirty = @changed_attributes.keys
+ attributes = self.class.initialize_attributes(coder['attributes'].except(*dirty))
+ @attributes.update(attributes)
@changed_attributes.update(coder['attributes'].slice(*dirty))
@changed_attributes.delete_if{|k,v| v.eql? @attributes[k]}
- set_serialized_attributes
-
run_callbacks :find
self
Please sign in to comment.
Something went wrong with that request. Please try again.