Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Don't cascade autosave validation to destroyed children. [#2761 state…

…:resolved]

Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
  • Loading branch information...
commit a44a1257d879311d88c2d10c366ab0d6561f903a 1 parent bcd0ef7
@cainlevy cainlevy authored alloy committed
View
2  activerecord/lib/active_record/autosave_association.rb
@@ -245,6 +245,8 @@ def validate_collection_association(reflection)
# 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?
View
5 activerecord/lib/active_record/base.rb
@@ -2813,6 +2813,11 @@ def frozen?
@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
View
11 activerecord/test/cases/autosave_association_test.rb
@@ -563,6 +563,17 @@ def save(*args)
children.each { |child| child.mark_for_destruction }
assert_difference("#{association_name.classify}.count", -2) { @pirate.save! }
end
+
+ define_method("test_should_skip_validation_on_the_#{association_name}_association_if_destroyed") do
+ @pirate.send(association_name).create!(:name => "#{association_name}_1")
+ children = @pirate.send(association_name)
+
+ children.each { |child| child.name = '' }
+ assert !@pirate.valid?
+
+ children.each { |child| child.destroy }
+ assert @pirate.valid?
+ end
define_method("test_should_rollback_destructions_if_an_exception_occurred_while_saving_#{association_name}") do
2.times { |i| @pirate.send(association_name).create!(:name => "#{association_name}_#{i}") }
View
2  activerecord/test/cases/base_test.rb
@@ -529,6 +529,7 @@ def test_delete
topic = Topic.find(1)
assert_equal topic, topic.delete, 'topic.delete did not return self'
assert topic.frozen?, 'topic not frozen after delete'
+ assert topic.destroyed?, 'topic not marked as being destroyed'
assert_raise(ActiveRecord::RecordNotFound) { Topic.find(topic.id) }
end
@@ -541,6 +542,7 @@ def test_destroy
topic = Topic.find(1)
assert_equal topic, topic.destroy, 'topic.destroy did not return self'
assert topic.frozen?, 'topic not frozen after destroy'
+ assert topic.destroyed?, 'topic not marked as being destroyed'
assert_raise(ActiveRecord::RecordNotFound) { Topic.find(topic.id) }
end
Please sign in to comment.
Something went wrong with that request. Please try again.