Add latest changes from gitlab-org/gitlab@12-10-stable-ee

1 files changed, 34 insertions, 0 deletions

diff --git a/db/migrate/20200408154604_add_u2f_registrations_user_id_foreign_key.rb b/db/migrate/20200408154604_add_u2f_registrations_user_id_foreign_key.rb
new file mode 100644
index 00000000000..0dc8a967955
--- /dev/null
+++ b/db/migrate/20200408154604_add_u2f_registrations_user_id_foreign_key.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+# rubocop: disable Migration/AddConcurrentForeignKey
+# rubocop: disable Migration/WithLockRetriesWithoutDdlTransaction
+class AddU2fRegistrationsUserIdForeignKey < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+  CONSTRAINT_NAME = 'fk_u2f_registrations_user_id'
+
+  disable_ddl_transaction!
+
+  def up
+    with_lock_retries do
+      add_foreign_key(:u2f_registrations, :users, on_delete: :cascade, validate: false, name: CONSTRAINT_NAME)
+      remove_foreign_key_if_exists(:u2f_registrations, column: :user_id, on_delete: nil)
+    end
+  end
+
+  def down
+    fk_exists = foreign_key_exists?(:u2f_registrations, :users, column: :user_id, on_delete: nil)
+
+    unless fk_exists
+      with_lock_retries do
+        add_foreign_key(:u2f_registrations, :users, column: :user_id, validate: false)
+      end
+    end
+
+    remove_foreign_key_if_exists(:u2f_registrations, column: :user_id, name: CONSTRAINT_NAME)
+
+    fk_name = concurrent_foreign_key_name(:u2f_registrations, :user_id, prefix: 'fk_rails_')
+    validate_foreign_key(:u2f_registrations, :user_id, name: fk_name)
+  end
+end