Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

1 files changed, 28 insertions, 0 deletions

diff --git a/db/post_migrate/20220826152430_remove_container_repository_deprecated_geo_fields.rb b/db/post_migrate/20220826152430_remove_container_repository_deprecated_geo_fields.rb
new file mode 100644
index 00000000000..f5cb2be4ebe
--- /dev/null
+++ b/db/post_migrate/20220826152430_remove_container_repository_deprecated_geo_fields.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+class RemoveContainerRepositoryDeprecatedGeoFields < Gitlab::Database::Migration[2.0]
+  disable_ddl_transaction!
+
+  def up
+    with_lock_retries do
+      remove_column :geo_event_log, :container_repository_updated_event_id, :bigint
+    end
+  end
+
+  def down
+    with_lock_retries do
+      unless column_exists?(:geo_event_log, :container_repository_updated_event_id)
+        add_column(:geo_event_log, :container_repository_updated_event_id, :bigint)
+      end
+    end
+
+    add_concurrent_foreign_key :geo_event_log, :geo_container_repository_updated_events,
+                               column: :container_repository_updated_event_id,
+                               name: 'fk_6ada82d42a',
+                               on_delete: :cascade
+
+    add_concurrent_index :geo_event_log,
+                         :container_repository_updated_event_id,
+                         name: 'index_geo_event_log_on_container_repository_updated_event_id'
+  end
+end