Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42

1 files changed, 20 insertions, 0 deletions

diff --git a/db/migrate/20210730103808_add_stage_hash_fk_to_group_stages.rb b/db/migrate/20210730103808_add_stage_hash_fk_to_group_stages.rb
new file mode 100644
index 00000000000..3cd53f2bb50
--- /dev/null
+++ b/db/migrate/20210730103808_add_stage_hash_fk_to_group_stages.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class AddStageHashFkToGroupStages < ActiveRecord::Migration[6.1]
+  include Gitlab::Database::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    unless column_exists?(:analytics_cycle_analytics_group_stages, :stage_event_hash_id)
+      add_column :analytics_cycle_analytics_group_stages, :stage_event_hash_id, :bigint
+    end
+
+    add_concurrent_index :analytics_cycle_analytics_group_stages, :stage_event_hash_id, name: 'index_group_stages_on_stage_event_hash_id'
+    add_concurrent_foreign_key :analytics_cycle_analytics_group_stages, :analytics_cycle_analytics_stage_event_hashes, column: :stage_event_hash_id, on_delete: :cascade
+  end
+
+  def down
+    remove_column :analytics_cycle_analytics_group_stages, :stage_event_hash_id
+  end
+end