Add latest changes from gitlab-org/gitlab@13-4-stable-ee

1 files changed, 21 insertions, 0 deletions

diff --git a/db/post_migrate/20200910175553_validate_not_null_external_diff_store_on_merge_request_diffs.rb b/db/post_migrate/20200910175553_validate_not_null_external_diff_store_on_merge_request_diffs.rb
new file mode 100644
index 00000000000..4dc8ac96a4c
--- /dev/null
+++ b/db/post_migrate/20200910175553_validate_not_null_external_diff_store_on_merge_request_diffs.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class ValidateNotNullExternalDiffStoreOnMergeRequestDiffs < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  # Remove index which was only added to fill external_diff_store
+  INDEX_NAME = 'index_merge_request_diffs_external_diff_store_is_null'
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    validate_not_null_constraint :merge_request_diffs, :external_diff_store
+
+    remove_concurrent_index_by_name :merge_request_diffs, INDEX_NAME
+  end
+
+  def down
+    add_concurrent_index :merge_request_diffs, :id, where: 'external_diff_store IS NULL', name: INDEX_NAME
+  end
+end