fix some destroy/restore edge cases with ActiveRecord 2.3.4

semanticart · Oct 14, 2009 · 4a9ae5a · 4a9ae5a
1 parent 72d2386
commit 4a9ae5a
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/lib/is_paranoid.rb b/lib/is_paranoid.rb
@@ -44,7 +44,8 @@ def self.find_with_destroyed *args
 
         # Mark the model deleted_at as now.
         def destroy_without_callbacks
-          self.update_attribute(:deleted_at, Time.now.utc)
+          self.deleted_at = Time.now.utc
+          update_without_callbacks
         end
 
         # Override the default destroy to allow us to flag deleted_at.
@@ -62,7 +63,9 @@ def destroy
         # Set deleted_at flag on a model to nil, effectively undoing the
         # soft-deletion.
         def restore
-          self.update_attribute(:deleted_at, nil)
+          self.deleted_at_will_change!
+          self.deleted_at = nil
+          update_without_callbacks
         end
       end
     end