From 2bcf7158d346e1b619aebbbec360ee0153ef8d06 Mon Sep 17 00:00:00 2001
From: Paul Nikitochkin <paul.nikitochkin@gmail.com>
Date: Sun, 22 Dec 2013 18:18:40 +0200
Subject: On destroying do not touch destroyed belongs to association.

Fixes: #13445
---
 activerecord/CHANGELOG.md                                   | 13 +++++++++++++
 .../lib/active_record/associations/builder/belongs_to.rb    |  2 +-
 .../test/cases/associations/belongs_to_associations_test.rb |  8 ++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

(limited to 'activerecord')

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 5ceb012aef..4e61a33fa1 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,16 @@
+*   Do not raise `'can not touch on a new record object'` exception on destroying already destroyed
+    `belongs_to` association with `touch: true` option
+
+    Fixes: #13445
+
+    Example:
+
+        # Given Comment has belongs_to :post, touch: true
+        comment.post.destroy
+        comment.destroy # no longer raises an error
+
+    *Paul Nikitochkin*
+
 *   Fix a bug when assigning an array containing string numbers to a
     PostgreSQL integer array column.
 
diff --git a/activerecord/lib/active_record/associations/builder/belongs_to.rb b/activerecord/lib/active_record/associations/builder/belongs_to.rb
index 62cc1e3a8d..5ccaa55a32 100644
--- a/activerecord/lib/active_record/associations/builder/belongs_to.rb
+++ b/activerecord/lib/active_record/associations/builder/belongs_to.rb
@@ -112,7 +112,7 @@ module ActiveRecord::Associations::Builder
       end
 
       record = o.send name
-      unless record.nil? || record.new_record?
+      if record && record.persisted?
         if touch != true
           record.touch touch
         else
diff --git a/activerecord/test/cases/associations/belongs_to_associations_test.rb b/activerecord/test/cases/associations/belongs_to_associations_test.rb
index 6d01fcf50c..3205d0c28b 100644
--- a/activerecord/test/cases/associations/belongs_to_associations_test.rb
+++ b/activerecord/test/cases/associations/belongs_to_associations_test.rb
@@ -356,6 +356,14 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase
     assert_queries(2) { line_item.destroy }
   end
 
+  def test_belongs_to_with_touch_option_on_destroy_with_destroyed_parent
+    line_item = LineItem.create!
+    invoice   = Invoice.create!(line_items: [line_item])
+    invoice.destroy
+
+    assert_queries(1) { line_item.destroy }
+  end
+
   def test_belongs_to_with_touch_option_on_touch_and_reassigned_parent
     line_item = LineItem.create!
     Invoice.create!(line_items: [line_item])
-- 
cgit v1.2.3