Permalink
Browse files

Revert "Merge pull request #10183 from jholton/fix_association_auto_s…

…ave"

This reverts commit e8727d3, reversing
changes made to d098e1c.

Reason: it broke the mysql build
  • Loading branch information...
1 parent e8727d3 commit 0920d4fccbfc41b6ccdae7070758fc2133280409 @jonleighton jonleighton committed Apr 19, 2013
@@ -1,12 +1,5 @@
## Rails 4.0.0 (unreleased) ##
-* 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*
-
* Run `rake migrate:down` & `rake migrate:up` in transaction if database supports.
*Alexander Bondarev*
@@ -334,18 +334,15 @@ def save_collection_association(reflection)
autosave = reflection.options[:autosave]
if records = associated_records_to_validate_or_save(association, @new_record_before_save, autosave)
-
- if autosave
- records_to_destroy = records.select(&:marked_for_destruction?)
- records_to_destroy.each { |record| association.destroy(record) }
- records -= records_to_destroy
- end
-
+ records_to_destroy = []
records.each do |record|
+ next if record.destroyed?
saved = true
- if autosave != false && (@new_record_before_save || record.new_record?)
+ if autosave && record.marked_for_destruction?
+ records_to_destroy << record
+ elsif autosave != false && (@new_record_before_save || record.new_record?)
if autosave
saved = association.insert_record(record, false)
else
@@ -357,6 +354,10 @@ 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
@@ -764,20 +764,6 @@ 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: "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

0 comments on commit 0920d4f

Please sign in to comment.