Fix touching has_one grandparent associations

activerecord/lib/active_record/touch_later.rb

@@ -24,9 +24,13 @@ def touch_later(*names) # :nodoc:
       @_new_record_before_last_commit ||= false
 
       # touch the parents as we are not calling the after_save callbacks
-      self.class.reflect_on_all_associations(:belongs_to).each do |r|
+      self.class.reflect_on_all_associations.each do |r|
         if touch = r.options[:touch]
-          ActiveRecord::Associations::Builder::BelongsTo.touch_record(self, changes_to_save, r.foreign_key, r.name, touch, :touch_later)
+          if r.macro == :belongs_to
+            ActiveRecord::Associations::Builder::BelongsTo.touch_record(self, changes_to_save, r.foreign_key, r.name, touch, :touch_later)
+          elsif r.macro == :has_one
+            ActiveRecord::Associations::Builder::HasOne.touch_record(self, r.name, touch)
+          end
         end
       end
     end

activerecord/test/cases/delegated_type_test.rb

@@ -1,19 +1,21 @@
 # frozen_string_literal: true
 
 require "cases/helper"
+require "models/account"
 require "models/entry"
 require "models/message"
+require "models/recipient"
 require "models/comment"
 require "models/uuid_entry"
 require "models/uuid_message"
 require "models/uuid_comment"
 
 class DelegatedTypeTest < ActiveRecord::TestCase
-  fixtures :comments
+  fixtures :comments, :accounts
 
   setup do
-    @entry_with_message = Entry.create! entryable: Message.new(subject: "Hello world!")
-    @entry_with_comment = Entry.create! entryable: comments(:greetings)
+    @entry_with_message = Entry.create! entryable: Message.new(subject: "Hello world!"), account: accounts(:signals37)
+    @entry_with_comment = Entry.create! entryable: comments(:greetings), account: accounts(:signals37)
 
     if current_adapter?(:PostgreSQLAdapter)
       @uuid_entry_with_message = UuidEntry.create! uuid: SecureRandom.uuid, entryable: UuidMessage.new(uuid: SecureRandom.uuid, subject: "Hello world!")
@@ -73,6 +75,20 @@ class DelegatedTypeTest < ActiveRecord::TestCase
     assert_nil @uuid_entry_with_comment.uuid_message_uuid
   end
 
+  test "touch account" do
+    previous_account_updated_at  = @entry_with_message.account.updated_at
+    previous_entry_updated_at    = @entry_with_message.updated_at
+    previous_messsage_updated_at = @entry_with_message.entryable.updated_at
+
+    travel 5.seconds do
+      Recipient.create! message: @entry_with_message.entryable, email_address: "test@test.com"
+    end
+
+    assert_not_equal @entry_with_message.reload.account.updated_at, previous_account_updated_at
+    assert_not_equal @entry_with_message.reload.updated_at, previous_entry_updated_at
+    assert_not_equal @entry_with_message.reload.entryable.updated_at, previous_messsage_updated_at
+  end
+
   test "builder method" do
     assert_respond_to Entry.new, :build_entryable
     assert_equal Message, Entry.new(entryable_type: "Message").build_entryable.class

activerecord/test/models/entry.rb

@@ -2,4 +2,5 @@
 
 class Entry < ActiveRecord::Base
   delegated_type :entryable, types: %w[ Message Comment ]
+  belongs_to :account, touch: true
 end

activerecord/test/models/message.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
 class Message < ActiveRecord::Base
-  has_one :entry, as: :entryable
+  has_one  :entry, as: :entryable, touch: true
+  has_many :recipients
 end

activerecord/test/models/recipient.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class Recipient < ActiveRecord::Base
+  belongs_to :message, touch: true
+end

activerecord/test/schema/schema.rb

@@ -17,6 +17,7 @@
     t.string  :firm_name
     t.integer :credit_limit
     t.integer "a" * max_identifier_length
+    t.datetime :updated_at
   end
 
   create_table :admin_accounts, force: true do |t|
@@ -465,8 +466,10 @@
   end
 
   create_table :entries, force: true do |t|
-    t.string  :entryable_type, null: false
-    t.integer :entryable_id, null: false
+    t.string   :entryable_type, null: false
+    t.integer  :entryable_id, null: false
+    t.integer  :account_id, null: false
+    t.datetime :updated_at
   end
 
   create_table :essays, force: true do |t|
@@ -672,7 +675,8 @@
   end
 
   create_table :messages, force: true do |t|
-    t.string :subject
+    t.string   :subject
+    t.datetime :updated_at
   end
 
   create_table :minivans, force: true, id: false do |t|
@@ -1277,6 +1281,11 @@
     t.integer :hotel_id
   end
 
+  create_table :recipients, force: true do |t|
+    t.integer  :message_id
+    t.string   :email_address
+  end
+
   create_table :records, force: true do |t|
   end