From 09f12a12706593884961a682660f34282e937e46 Mon Sep 17 00:00:00 2001 From: Emilio Tagua Date: Mon, 13 Sep 2010 14:56:14 -0300 Subject: Use identity mapper only if enabled. --- activerecord/lib/active_record/persistence.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/persistence.rb b/activerecord/lib/active_record/persistence.rb index a7181fd79b..4fce0cbb3f 100644 --- a/activerecord/lib/active_record/persistence.rb +++ b/activerecord/lib/active_record/persistence.rb @@ -66,7 +66,7 @@ module ActiveRecord def delete if persisted? self.class.delete(id) - IdentityMap.remove(self) + IdentityMap.remove(self) if IdentityMap.enabled? end @destroyed = true freeze @@ -76,7 +76,7 @@ module ActiveRecord # that no changes should be made (since they can't be persisted). def destroy if persisted? - IdentityMap.remove(self) + IdentityMap.remove(self) if IdentityMap.enabled? self.class.unscoped.where(self.class.arel_table[self.class.primary_key].eq(id)).delete_all end @@ -279,7 +279,7 @@ module ActiveRecord self.id ||= new_id - IdentityMap.add(self) + IdentityMap.add(self) if IdentityMap.enabled? @persisted = true id end -- cgit v1.2.3