Merge pull request #10417 from jholton/fix_association_auto_save
autosave_association issue that occurs when table has unique index (resubmission)
This commit is contained in:
commit
6023a50491
@ -1,3 +1,10 @@
|
||||
* fixes bug introduced by #3329. Now, when autosaving associations,
|
||||
deletions happen before inserts and saves. This prevents a 'duplicate
|
||||
unique value' database error that would occur if a record being created had
|
||||
the same value on a unique indexed field as that of a record being destroyed.
|
||||
|
||||
*Johnny Holton*
|
||||
|
||||
* Handle aliased attributes in ActiveRecord::Relation.
|
||||
|
||||
When using symbol keys, ActiveRecord will now translate aliased attribute names to the actual column name used in the database:
|
||||
|
@ -335,15 +335,18 @@ def save_collection_association(reflection)
|
||||
autosave = reflection.options[:autosave]
|
||||
|
||||
if records = associated_records_to_validate_or_save(association, @new_record_before_save, autosave)
|
||||
records_to_destroy = []
|
||||
|
||||
if autosave
|
||||
records_to_destroy = records.select(&:marked_for_destruction?)
|
||||
records_to_destroy.each { |record| association.destroy(record) }
|
||||
records -= records_to_destroy
|
||||
end
|
||||
|
||||
records.each do |record|
|
||||
next if record.destroyed?
|
||||
|
||||
saved = true
|
||||
|
||||
if autosave && record.marked_for_destruction?
|
||||
records_to_destroy << record
|
||||
elsif autosave != false && (@new_record_before_save || record.new_record?)
|
||||
if autosave != false && (@new_record_before_save || record.new_record?)
|
||||
if autosave
|
||||
saved = association.insert_record(record, false)
|
||||
else
|
||||
@ -355,10 +358,6 @@ def save_collection_association(reflection)
|
||||
|
||||
raise ActiveRecord::Rollback unless saved
|
||||
end
|
||||
|
||||
records_to_destroy.each do |record|
|
||||
association.destroy(record)
|
||||
end
|
||||
end
|
||||
|
||||
# reconstruct the scope now that we know the owner's id
|
||||
|
@ -566,7 +566,7 @@ def test_autosave_new_record_on_has_many_can_be_disabled_per_relationship
|
||||
end
|
||||
|
||||
class TestDestroyAsPartOfAutosaveAssociation < ActiveRecord::TestCase
|
||||
self.use_transactional_fixtures = false unless supports_savepoints?
|
||||
self.use_transactional_fixtures = false
|
||||
|
||||
def setup
|
||||
super
|
||||
@ -764,6 +764,20 @@ def test_when_new_record_a_child_marked_for_destruction_should_not_affect_other_
|
||||
assert_equal 2, @pirate.birds.reload.length
|
||||
end
|
||||
|
||||
def test_should_save_new_record_that_has_same_value_as_existing_record_marked_for_destruction_on_field_that_has_unique_index
|
||||
Bird.connection.add_index :birds, :name, unique: true
|
||||
|
||||
3.times { |i| @pirate.birds.create(name: "unique_birds_#{i}") }
|
||||
|
||||
@pirate.birds[0].mark_for_destruction
|
||||
@pirate.birds.build(name: @pirate.birds[0].name)
|
||||
@pirate.save!
|
||||
|
||||
assert_equal 3, @pirate.birds.reload.length
|
||||
ensure
|
||||
Bird.connection.remove_index :birds, column: :name
|
||||
end
|
||||
|
||||
# Add and remove callbacks tests for association collections.
|
||||
%w{ method proc }.each do |callback_type|
|
||||
define_method("test_should_run_add_callback_#{callback_type}s_for_has_many") do
|
||||
@ -846,8 +860,10 @@ def test_a_child_marked_for_destruction_should_not_be_destroyed_twice_while_savi
|
||||
@pirate.parrots.each { |parrot| parrot.mark_for_destruction }
|
||||
assert @pirate.save
|
||||
|
||||
assert_queries(0) do
|
||||
assert @pirate.save
|
||||
Pirate.transaction do
|
||||
assert_queries(0) do
|
||||
assert @pirate.save
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user