diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-05-22 15:38:15 -0700 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-05-22 15:38:15 -0700 |
commit | f8c4805a8247a62594d29c5f3ef634d57d2abbf1 (patch) | |
tree | b86133054b398f98d461df8b97a138390240d0f4 /activerecord/test/cases | |
parent | b0f96d4436619b25b8024cc70a71c77bcfc12bf6 (diff) | |
parent | c2362461cdf9615d5704d6f2942921b84b854c3c (diff) | |
download | rails-f8c4805a8247a62594d29c5f3ef634d57d2abbf1.tar.gz rails-f8c4805a8247a62594d29c5f3ef634d57d2abbf1.tar.bz2 rails-f8c4805a8247a62594d29c5f3ef634d57d2abbf1.zip |
Merge pull request #10681 from jholton/3-2-stable-fix_association_auto_save
autosave_association issue that occurs when table has unique index (3.2.x backport)
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r-- | activerecord/test/cases/autosave_association_test.rb | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/activerecord/test/cases/autosave_association_test.rb b/activerecord/test/cases/autosave_association_test.rb index e6b881389b..bb07cf4185 100644 --- a/activerecord/test/cases/autosave_association_test.rb +++ b/activerecord/test/cases/autosave_association_test.rb @@ -583,7 +583,7 @@ class TestDefaultAutosaveAssociationOnNewRecord < ActiveRecord::TestCase end class TestDestroyAsPartOfAutosaveAssociation < ActiveRecord::TestCase - self.use_transactional_fixtures = false unless supports_savepoints? + self.use_transactional_fixtures = false def setup @pirate = Pirate.create(:catchphrase => "Don' botharrr talkin' like one, savvy?") @@ -780,6 +780,20 @@ class TestDestroyAsPartOfAutosaveAssociation < ActiveRecord::TestCase 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 @@ -862,8 +876,10 @@ class TestDestroyAsPartOfAutosaveAssociation < ActiveRecord::TestCase @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 |