From a44a1257d879311d88c2d10c366ab0d6561f903a Mon Sep 17 00:00:00 2001
From: Lance Ivy <lance@cainlevy.net>
Date: Sat, 11 Jul 2009 15:09:09 +0200
Subject: Don't cascade autosave validation to destroyed children. [#2761
 state:resolved] Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>

---
 activerecord/lib/active_record/autosave_association.rb | 2 ++
 activerecord/lib/active_record/base.rb                 | 5 +++++
 2 files changed, 7 insertions(+)

(limited to 'activerecord/lib/active_record')

diff --git a/activerecord/lib/active_record/autosave_association.rb b/activerecord/lib/active_record/autosave_association.rb
index c1bc8423a9..ebd47ec634 100644
--- a/activerecord/lib/active_record/autosave_association.rb
+++ b/activerecord/lib/active_record/autosave_association.rb
@@ -245,6 +245,8 @@ module ActiveRecord
     # the parent, <tt>self</tt>, if it wasn't. Skips any <tt>:autosave</tt>
     # enabled records if they're marked_for_destruction?.
     def association_valid?(reflection, association)
+      return true if association.destroyed?
+
       unless valid = association.valid?
         if reflection.options[:autosave]
           unless association.marked_for_destruction?
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index afa4185c60..2f6e3e8ffd 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -2813,6 +2813,11 @@ module ActiveRecord #:nodoc:
         @attributes.frozen?
       end
 
+      # Returns +true+ if the record has been destroyed.
+      def destroyed?
+        @destroyed
+      end
+
       # Returns duplicated record with unfreezed attributes.
       def dup
         obj = super
-- 
cgit v1.2.3