From 5040b7259b3f422b596fe2f7b040c9bb3506a19a Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Tue, 7 May 2019 20:24:22 +0000 Subject: [PATCH] Merge branch 'ce-11099-removing-the-project-that-holds-the-insights-configuration-raises-an-error' into 'master' Add remove_foreign_key_if_exists See merge request gitlab-org/gitlab-ce!28172 (cherry picked from commit 7b7416d9862f52fe0f0a304eeeaaa4b8d65bc8eb) 24eff5e0 Add remove_foreign_key_if_exists --- lib/gitlab/database/migration_helpers.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/gitlab/database/migration_helpers.rb b/lib/gitlab/database/migration_helpers.rb index 7f5eb1188fc..cc61bb7fa02 100644 --- a/lib/gitlab/database/migration_helpers.rb +++ b/lib/gitlab/database/migration_helpers.rb @@ -905,6 +905,12 @@ module Gitlab end end + def remove_foreign_key_if_exists(*args) + if foreign_key_exists?(*args) + remove_foreign_key(*args) + end + end + def remove_foreign_key_without_error(*args) remove_foreign_key(*args) rescue ArgumentError -- GitLab