Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 5 deletions

diff --git a/lib/gitlab/database/migration_helpers/loose_foreign_key_helpers.rb b/lib/gitlab/database/migration_helpers/loose_foreign_key_helpers.rb
index 30601bffd7a..2221aea9f46 100644
--- a/lib/gitlab/database/migration_helpers/loose_foreign_key_helpers.rb
+++ b/lib/gitlab/database/migration_helpers/loose_foreign_key_helpers.rb
@@ -9,11 +9,11 @@ module Gitlab
         DELETED_RECORDS_INSERT_FUNCTION_NAME = 'insert_into_loose_foreign_keys_deleted_records'
 
         def track_record_deletions(table)
-          execute(<<~SQL)
-          CREATE TRIGGER #{record_deletion_trigger_name(table)}
-          AFTER DELETE ON #{table} REFERENCING OLD TABLE AS old_table
-          FOR EACH STATEMENT
-          EXECUTE FUNCTION #{DELETED_RECORDS_INSERT_FUNCTION_NAME}();
+          execute(<<~SQL.squish)
+            CREATE TRIGGER #{record_deletion_trigger_name(table)}
+            AFTER DELETE ON #{table} REFERENCING OLD TABLE AS old_table
+            FOR EACH STATEMENT
+            EXECUTE FUNCTION #{DELETED_RECORDS_INSERT_FUNCTION_NAME}();
           SQL
         end
 
@@ -21,6 +21,10 @@ module Gitlab
           drop_trigger(table, record_deletion_trigger_name(table))
         end
 
+        def has_loose_foreign_key?(table)
+          trigger_exists?(table, record_deletion_trigger_name(table))
+        end
+
         private
 
         def record_deletion_trigger_name(table)