Ticket #7096: has_one_dependent_destroy_on_reassign.diff

test/associations_test.rb

@@ -248 +248 @@
-    firm.save!
-    assert_nothing_raised { firm.destroy }
-  end
+  
+  def test_destroying_removes_dependent_from_db
+    tw = Firm.create("name" => "GlobalMegaCorp")
+    acct = tw.create_account("credit_limit" => 1000)
+    assert_nothing_raised { Account.find(acct.id) }
+    tw.destroy
+    assert_raises(ActiveRecord::RecordNotFound) {
+      Account.find(acct.id)
+    }
+  end
-
+  def test_reassignment_removes_old_dependent_from_db
+    tw = Firm.create("name" => "GlobalMegaCorp")
+    first_dependent = tw.create_account("credit_limit" => 1000)
+    second_dependent = tw.create_account("credit_limit" => 2000)
+    tw.save!
+    assert_raises(ActiveRecord::RecordNotFound) {
+      Account.find(first_dependent.id)
+    }
+  end
+
-  def test_succesful_build_association
-    firm = Firm.new("name" => "GlobalMegaCorp")
-    firm.save

lib/active_record/associations/has_one_association.rb

@@ -6 +6 @@
-        construct_sql
-      end
-
+      # Create the associated model instance, persisting it to the database
-      def create(attrs = {}, replace_existing = true)
-
+, false
-      end
-
+      # Create the associated mode instance, persisting it to the database
-      def create!(attrs = {}, replace_existing = true)
-
+, false
-      end
-
+      # Build the associated model instance, but do not persist it to the database
-      def build(attrs = {}, replace_existing = true)
-
+, true
-      end
-
-      def replace(obj, dont_save = false)
@@ -75 +78 @@
-          { :create => create_scoping }
-        end
-
-
+, dont_save=true
-          # make sure we load the target first, if we plan on replacing the existing
-          # instance. Otherwise, if the target has not previously been loaded
-          # elsewhere, the instance we create will get orphaned.
@@ -83 +86 @@
-          record = @reflection.klass.with_scope(:create => construct_scope[:create]) { yield @reflection.klass }
-
-          if replace_existing
-tru
+dont_sav
-          else
-            record[@reflection.primary_key_name] = @owner.id unless @owner.new_record?
-            self.target = record