diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-12-22 23:21:38 +0000 |
|---|---|---|
| committer | Arun Agrawal <arunagw@gmail.com> | 2011-12-23 12:00:37 +0530 |
| commit | 96c38eca23652ac40df26aac5dd48e214cb570cf (patch) | |
| tree | 71848b65a89773f547eba7f2d7de6022c38fabd0 /activerecord | |
| parent | 5f2bfce9e0f4e9995c341ca27320e32ae0d9880f (diff) | |
| download | rails-96c38eca23652ac40df26aac5dd48e214cb570cf.tar.gz rails-96c38eca23652ac40df26aac5dd48e214cb570cf.tar.bz2 rails-96c38eca23652ac40df26aac5dd48e214cb570cf.zip | |
Fix build when IM=true
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/identity_map.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/identity_map.rb b/activerecord/lib/active_record/identity_map.rb index b15b5a8133..680d9ffea0 100644 --- a/activerecord/lib/active_record/identity_map.rb +++ b/activerecord/lib/active_record/identity_map.rb @@ -111,13 +111,12 @@ module ActiveRecord # 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 |