diff options
| author | Emilio Tagua <miloops@gmail.com> | 2010-10-20 19:04:09 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2010-11-19 19:08:57 -0300 |
| commit | 5ee3663101f224a30ec95f6dab4b02a4a922eb2f (patch) | |
| tree | 06ee8ff57556e357a9f350aa54fc699dc670c2b7 | |
| parent | 095c445819f686f464ed252e50ed7d2862430ad4 (diff) | |
| download | rails-5ee3663101f224a30ec95f6dab4b02a4a922eb2f.tar.gz rails-5ee3663101f224a30ec95f6dab4b02a4a922eb2f.tar.bz2 rails-5ee3663101f224a30ec95f6dab4b02a4a922eb2f.zip | |
Remove associated objects from IM when clearing them from association cache.
| -rw-r--r-- | activerecord/lib/active_record/associations.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 08a4ebfd7e..12b0601e3c 100644 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -117,6 +117,12 @@ module ActiveRecord # Clears out the association cache. def clear_association_cache #:nodoc: self.class.reflect_on_all_associations.to_a.each do |assoc| + if IdentityMap.enabled? && instance_variable_defined?("@#{assoc.name}") + targets = [*instance_variable_get("@#{assoc.name}")] + targets.map! { |t| t.respond_to?(:target) ? t.target : t } + targets.compact! + targets.each { |r| IdentityMap.remove r } + end instance_variable_set "@#{assoc.name}", nil end if self.persisted? end |