Merge remote-tracking branch 'parent/main' into upstream-20241209

db/migrate/20241205135901_remove_legacy_user_settings_data.rb

@@ -8,6 +8,22 @@ class RemoveLegacyUserSettingsData < ActiveRecord::Migration[7.2]
         thing_type IS NOT NULL
         AND thing_id IS NOT NULL
     SQL
+
+    # When running these migrations on mastodon.social, we saw 'notification_emails'
+    # and 'interactions' records that were not associated to a user and caused a
+    # migration issue.
+    # While I have not been able to pinpoint the exact cause of the issue, it is likely
+    # related to the settings system changes made in b11fdc3ae3f90731c01149a5a36dc64e065d4ea2.
+    # So, delete a few user settings that should already have been deleted.
+    connection.execute(<<~SQL.squish)
+      DELETE FROM settings
+      WHERE var IN (
+        'notification_emails', 'interactions', 'boost_modal', 'auto_play_gif',
+        'delete_modal', 'system_font_ui', 'default_sensitive', 'unfollow_modal',
+        'reduce_motion', 'display_sensitive_media', 'hide_network', 'expand_spoilers',
+        'display_media', 'aggregate_reblogs', 'show_application', 'advanced_layout',
+        'use_blurhash', 'use_pending_items')
+    SQL
   end
 
   def down

db/migrate/20241205162640_add_missing_delete_cascade_webauthn_credentials.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+class AddMissingDeleteCascadeWebauthnCredentials < ActiveRecord::Migration[7.2]
+  def up
+    safety_assured do
+      execute <<~SQL.squish
+        ALTER TABLE webauthn_credentials
+          DROP CONSTRAINT fk_rails_a4355aef77,
+          ADD CONSTRAINT fk_rails_a4355aef77
+            FOREIGN KEY (user_id)
+            REFERENCES users(id)
+            ON DELETE CASCADE
+      SQL
+    end
+  end
+
+  def down
+    safety_assured do
+      execute <<~SQL.squish
+        ALTER TABLE webauthn_credentials
+          DROP CONSTRAINT fk_rails_a4355aef77,
+          ADD CONSTRAINT fk_rails_a4355aef77
+            FOREIGN KEY (user_id)
+            REFERENCES users(id)
+      SQL
+    end
+  end
+end

db/migrate/20241205163118_add_missing_delete_cascade_account_moderation_notes.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+class AddMissingDeleteCascadeAccountModerationNotes < ActiveRecord::Migration[7.2]
+  def up
+    safety_assured do
+      execute <<~SQL.squish
+        ALTER TABLE account_moderation_notes
+          DROP CONSTRAINT fk_rails_3f8b75089b,
+          ADD CONSTRAINT fk_rails_3f8b75089b
+            FOREIGN KEY (account_id)
+            REFERENCES accounts(id)
+            ON DELETE CASCADE
+      SQL
+
+      execute <<~SQL.squish
+        ALTER TABLE account_moderation_notes
+          DROP CONSTRAINT fk_rails_dd62ed5ac3,
+          ADD CONSTRAINT fk_rails_dd62ed5ac3
+            FOREIGN KEY (target_account_id)
+            REFERENCES accounts(id)
+            ON DELETE CASCADE
+      SQL
+    end
+  end
+
+  def down
+    safety_assured do
+      execute <<~SQL.squish
+        ALTER TABLE account_moderation_notes
+          DROP CONSTRAINT fk_rails_3f8b75089b,
+          ADD CONSTRAINT fk_rails_3f8b75089b
+            FOREIGN KEY (account_id)
+            REFERENCES accounts(id)
+      SQL
+
+      execute <<~SQL.squish
+        ALTER TABLE account_moderation_notes
+          DROP CONSTRAINT fk_rails_dd62ed5ac3,
+          ADD CONSTRAINT fk_rails_dd62ed5ac3
+            FOREIGN KEY (target_account_id)
+            REFERENCES accounts(id)
+      SQL
+    end
+  end
+end