diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-05-23 15:40:00 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-05-23 15:40:00 +0000 |
| commit | 31413f4c1469ebffe00cc657c3f94a59b48ace07 (patch) | |
| tree | 2ce798695dbaa7d6294712b0b70025acdac3f9ae | |
| parent | 83796a718d097114c6848b0c24fa45d96c4499d2 (diff) | |
| parent | b92b1e8d9ecfa44cb4bddf63c8bda2348284abe6 (diff) | |
| download | gitlab-ce-31413f4c1469ebffe00cc657c3f94a59b48ace07.tar.gz | |
Merge branch '46630-add-missing-columns-to-project-mirror-data' into 'master'
Upgrading from EE to CE fails on project_mirror_data migrations
Closes #46630
See merge request gitlab-org/gitlab-ce!19109
| -rw-r--r-- | changelogs/unreleased/46630-add-missing-columns-to-project-mirror-data.yml | 5 | ||||
| -rw-r--r-- | db/migrate/20180503175053_ensure_missing_columns_to_project_mirror_data.rb | 15 |
2 files changed, 20 insertions, 0 deletions
diff --git a/changelogs/unreleased/46630-add-missing-columns-to-project-mirror-data.yml b/changelogs/unreleased/46630-add-missing-columns-to-project-mirror-data.yml new file mode 100644 index 00000000000..cc153b85440 --- /dev/null +++ b/changelogs/unreleased/46630-add-missing-columns-to-project-mirror-data.yml @@ -0,0 +1,5 @@ +--- +title: Fix project mirror database inconsistencies when upgrading from EE to CE +merge_request: 19109 +author: +type: fixed diff --git a/db/migrate/20180503175053_ensure_missing_columns_to_project_mirror_data.rb b/db/migrate/20180503175053_ensure_missing_columns_to_project_mirror_data.rb new file mode 100644 index 00000000000..970a53d68d0 --- /dev/null +++ b/db/migrate/20180503175053_ensure_missing_columns_to_project_mirror_data.rb @@ -0,0 +1,15 @@ +class EnsureMissingColumnsToProjectMirrorData < ActiveRecord::Migration + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + def up + add_column :project_mirror_data, :status, :string unless column_exists?(:project_mirror_data, :status) + add_column :project_mirror_data, :jid, :string unless column_exists?(:project_mirror_data, :jid) + add_column :project_mirror_data, :last_error, :text unless column_exists?(:project_mirror_data, :last_error) + end + + def down + # db/migrate/20180502122856_create_project_mirror_data.rb will remove the table + end +end |