Merge pull request #9141 from adamgamble/issue-9091

belongs_to :touch should touch old record when transitioning.

1 files changed, 10 insertions, 0 deletions

diff --git a/activerecord/lib/active_record/associations/builder/belongs_to.rb b/activerecord/lib/active_record/associations/builder/belongs_to.rb
index 9ac561b997..579d7789bd 100644
--- a/activerecord/lib/active_record/associations/builder/belongs_to.rb
+++ b/activerecord/lib/active_record/associations/builder/belongs_to.rb
@@ -68,6 +68,16 @@ module ActiveRecord::Associations::Builder
         def belongs_to_touch_after_save_or_destroy_for_#{name}
           record = #{name}
 
+          foreign_key_field   = #{reflection.foreign_key}
+          if changed_attributes.key?(foreign_key_field)
+            reflection_klass  = #{reflection.klass}
+            old_foreign_id    = changed_attributes[foreign_key_field]
+            old_record        = reflection_klass.where(foreign_key_field.to_sym => old_foreign_id).first
+            if old_record
+              old_record.touch #{options[:touch].inspect if options[:touch] != true}
+            end
+          end
+
           unless record.nil? || record.new_record?
             record.touch #{options[:touch].inspect if options[:touch] != true}
           end