Merge pull request #31652 from kami-zh/activestorage-callbacks

Change Active Storage destroy callbacks

2 files changed, 8 insertions, 2 deletions

diff --git a/activestorage/CHANGELOG.md b/activestorage/CHANGELOG.md
index 9ce177b462..5e01297fc1 100644
--- a/activestorage/CHANGELOG.md
+++ b/activestorage/CHANGELOG.md
@@ -1,3 +1,9 @@
+*   Use `after_destroy_commit` instead of `before_destroy` for purging
+    attachments when a record is destroyed.
+
+    *Hiroki Zenigami*
+
+
 *   Force `:attachment` disposition for specific, configurable content types.
     This mitigates possible security issues such as XSS or phishing when
     serving them inline. A list of such content types is included by default,
diff --git a/activestorage/lib/active_storage/attached/macros.rb b/activestorage/lib/active_storage/attached/macros.rb
index 442dcabd0c..c51efa9d6b 100644
--- a/activestorage/lib/active_storage/attached/macros.rb
+++ b/activestorage/lib/active_storage/attached/macros.rb
@@ -44,7 +44,7 @@ module ActiveStorage
       scope :"with_attached_#{name}", -> { includes("#{name}_attachment": :blob) }
 
       if dependent == :purge_later
-        before_destroy { public_send(name).purge_later }
+        after_destroy_commit { public_send(name).purge_later }
       end
     end
 
@@ -89,7 +89,7 @@ module ActiveStorage
       scope :"with_attached_#{name}", -> { includes("#{name}_attachments": :blob) }
 
       if dependent == :purge_later
-        before_destroy { public_send(name).purge_later }
+        after_destroy_commit { public_send(name).purge_later }
       end
     end
   end