Add latest changes from gitlab-org/gitlab@15-9-stable-eev15.9.0-rc42

1 files changed, 23 insertions, 0 deletions

diff --git a/db/post_migrate/20230209103714_add_fk_to_approval_rules_on_scan_result_policy_id.rb b/db/post_migrate/20230209103714_add_fk_to_approval_rules_on_scan_result_policy_id.rb
new file mode 100644
index 00000000000..cfc2c33b32a
--- /dev/null
+++ b/db/post_migrate/20230209103714_add_fk_to_approval_rules_on_scan_result_policy_id.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class AddFkToApprovalRulesOnScanResultPolicyId < Gitlab::Database::Migration[2.1]
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_foreign_key :approval_project_rules,
+      :scan_result_policies,
+      column: :scan_result_policy_id,
+      on_delete: :cascade,
+      reverse_lock_order: true
+    add_concurrent_foreign_key :approval_merge_request_rules,
+      :scan_result_policies,
+      column: :scan_result_policy_id,
+      on_delete: :cascade,
+      reverse_lock_order: true
+  end
+
+  def down
+    remove_foreign_key_if_exists :approval_project_rules, column: :scan_result_policy_id
+    remove_foreign_key_if_exists :approval_merge_request_rules, column: :scan_result_policy_id
+  end
+end