diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-02-13 12:50:12 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2018-02-13 12:50:12 +0000 |
commit | c133f1a7480d32641d48ca5f0c6155a5cbb89e89 (patch) | |
tree | 0f8492facdc19d63821a8eaec8e0b5c13954a177 /db | |
parent | 41285af45d086ded796c6e05eed31890df69d825 (diff) | |
parent | 4e6a8eaab6004d789cab08e625478fe9d5ef2bb7 (diff) | |
download | gitlab-ce-c133f1a7480d32641d48ca5f0c6155a5cbb89e89.tar.gz |
Merge branch 'mk-fix-no-untracked-upload-files-error' into 'master'
Resolve "PrepareUntrackedUploads PostgreSQL syntax error"
Closes #42881
See merge request gitlab-org/gitlab-ce!17019
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20180208183958_schedule_populate_untracked_uploads_if_needed.rb | 47 | ||||
-rw-r--r-- | db/schema.rb | 2 |
2 files changed, 48 insertions, 1 deletions
diff --git a/db/migrate/20180208183958_schedule_populate_untracked_uploads_if_needed.rb b/db/migrate/20180208183958_schedule_populate_untracked_uploads_if_needed.rb new file mode 100644 index 00000000000..e46e793d9d2 --- /dev/null +++ b/db/migrate/20180208183958_schedule_populate_untracked_uploads_if_needed.rb @@ -0,0 +1,47 @@ +# See http://doc.gitlab.com/ce/development/migration_style_guide.html +# for more information on how to write migrations for GitLab. + +class SchedulePopulateUntrackedUploadsIfNeeded < ActiveRecord::Migration + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + FOLLOW_UP_MIGRATION = 'PopulateUntrackedUploads'.freeze + + class UntrackedFile < ActiveRecord::Base + include EachBatch + + self.table_name = 'untracked_files_for_uploads' + end + + def up + if table_exists?(:untracked_files_for_uploads) + process_or_remove_table + end + end + + def down + # nothing + end + + private + + def process_or_remove_table + if UntrackedFile.all.empty? + drop_temp_table + else + schedule_populate_untracked_uploads_jobs + end + end + + def drop_temp_table + drop_table(:untracked_files_for_uploads, if_exists: true) + end + + def schedule_populate_untracked_uploads_jobs + say "Scheduling #{FOLLOW_UP_MIGRATION} background migration jobs since there are rows in untracked_files_for_uploads." + + bulk_queue_background_migration_jobs_by_range( + UntrackedFile, FOLLOW_UP_MIGRATION) + end +end diff --git a/db/schema.rb b/db/schema.rb index d07a4c31618..b281be110da 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20180206200543) do +ActiveRecord::Schema.define(version: 20180208183958) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" |