diff options
| author | Andreas Brandl <abrandl@gitlab.com> | 2019-09-02 18:26:47 +0200 |
|---|---|---|
| committer | Andreas Brandl <abrandl@gitlab.com> | 2019-09-02 20:22:20 +0200 |
| commit | 1b81a81b9594300349ec90a710d3cfff857f6bda (patch) | |
| tree | f4eb6b237fd879b84b17173ead1ef158dd0d631d | |
| parent | f4e40c532b5582f47a0dd9bf7054112fc9ec6085 (diff) | |
| download | gitlab-ce-ab-remove-support-bot-column.tar.gz | |
Remove Users.support_bot columnab-remove-support-bot-column
This column is not present in `db/schema.rb` and hence needs to be
removed conditionally.
See https://gitlab.com/gitlab-org/gitlab-ce/issues/66901 for background
| -rw-r--r-- | changelogs/unreleased/ab-remove-support-bot-column.yml | 5 | ||||
| -rw-r--r-- | db/post_migrate/20190902160015_remove_support_bot_column_from_users.rb | 19 | ||||
| -rw-r--r-- | db/schema.rb | 2 |
3 files changed, 25 insertions, 1 deletions
diff --git a/changelogs/unreleased/ab-remove-support-bot-column.yml b/changelogs/unreleased/ab-remove-support-bot-column.yml new file mode 100644 index 00000000000..d256ded0410 --- /dev/null +++ b/changelogs/unreleased/ab-remove-support-bot-column.yml @@ -0,0 +1,5 @@ +--- +title: Remove Users.support_bot column +merge_request: 32554 +author: +type: other diff --git a/db/post_migrate/20190902160015_remove_support_bot_column_from_users.rb b/db/post_migrate/20190902160015_remove_support_bot_column_from_users.rb new file mode 100644 index 00000000000..80d69b57f5d --- /dev/null +++ b/db/post_migrate/20190902160015_remove_support_bot_column_from_users.rb @@ -0,0 +1,19 @@ +# frozen_string_literal: true + +class RemoveSupportBotColumnFromUsers < ActiveRecord::Migration[5.2] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + disable_ddl_transaction! + + def up + return unless column_exists?(:users, :support_bot) + + remove_column :users, :support_bot + end + + def down + # no-op because the column should not exist in the previous version + end +end diff --git a/db/schema.rb b/db/schema.rb index 5b89cdf0b98..1a5d013edd3 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_09_02_131045) do +ActiveRecord::Schema.define(version: 2019_09_02_160015) do # These are extensions that must be enabled in order to support this database enable_extension "pg_trgm" |