diff --git a/app/models/project.rb b/app/models/project.rb index 4eb82e1611e7107893859f42e6744092463c2e08..dcf2b17e049cb114bad81ece6ee0dae46595a93b 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -55,8 +55,6 @@ class Project < ApplicationRecord VALID_MIRROR_PORTS = [22, 80, 443].freeze VALID_MIRROR_PROTOCOLS = %w(http https ssh git).freeze - ignore_column :import_status, :import_jid, :import_error - cache_markdown_field :description, pipeline: :description delegate :feature_available?, :builds_enabled?, :wiki_enabled?, diff --git a/changelogs/unreleased/sh-remove-import-columns-from-projects.yml b/changelogs/unreleased/sh-remove-import-columns-from-projects.yml new file mode 100644 index 0000000000000000000000000000000000000000..f4052b2bef591f5ac1e579483002f7d3eff3f7f2 --- /dev/null +++ b/changelogs/unreleased/sh-remove-import-columns-from-projects.yml @@ -0,0 +1,5 @@ +--- +title: Remove import columns from projects table +merge_request: 29863 +author: +type: performance diff --git a/config/pseudonymizer.yml b/config/pseudonymizer.yml index cd1bf91afa4b1d118876afb18ed13360089a4df8..1d85ac1db45a20052904efe64f73c0c8c52e5182 100644 --- a/config/pseudonymizer.yml +++ b/config/pseudonymizer.yml @@ -366,7 +366,6 @@ tables: - visibility_level - archived - avatar - - import_status - merge_requests_template - star_count - merge_requests_rebase_enabled diff --git a/db/post_migrate/20190619175843_remove_import_columns_from_projects.rb b/db/post_migrate/20190619175843_remove_import_columns_from_projects.rb new file mode 100644 index 0000000000000000000000000000000000000000..85f776ac99c07dc83ce531c998370eccf7cd0844 --- /dev/null +++ b/db/post_migrate/20190619175843_remove_import_columns_from_projects.rb @@ -0,0 +1,14 @@ +# frozen_string_literal: true + +class RemoveImportColumnsFromProjects < ActiveRecord::Migration[5.1] + include Gitlab::Database::MigrationHelpers + + # Set this constant to true if this migration requires downtime. + DOWNTIME = false + + def change + remove_column :projects, :import_status, :string + remove_column :projects, :import_jid, :string + remove_column :projects, :import_error, :text + end +end diff --git a/db/schema.rb b/db/schema.rb index 46ff47d451b412bf31902805613a6616c062a1c4..d3d511e88863cc21d3bb0027c2825ac53037f282 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: 20190613030606) do +ActiveRecord::Schema.define(version: 20190619175843) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -2595,7 +2595,6 @@ t.integer "visibility_level", default: 0, null: false t.boolean "archived", default: false, null: false t.string "avatar" - t.string "import_status" t.text "merge_requests_template" t.integer "star_count", default: 0, null: false t.boolean "merge_requests_rebase_enabled", default: false @@ -2609,7 +2608,6 @@ t.datetime "mirror_last_update_at" t.datetime "mirror_last_successful_update_at" t.integer "mirror_user_id" - t.text "import_error" t.boolean "shared_runners_enabled", default: true, null: false t.string "runners_token" t.string "build_coverage_regex" @@ -2635,7 +2633,6 @@ t.boolean "printing_merge_request_link_enabled", default: true, null: false t.integer "auto_cancel_pending_pipelines", default: 1, null: false t.boolean "service_desk_enabled", default: true - t.string "import_jid" t.integer "cached_markdown_version" t.text "delete_error" t.datetime "last_repository_updated_at" diff --git a/spec/lib/gitlab/database/migration_helpers_spec.rb b/spec/lib/gitlab/database/migration_helpers_spec.rb index 1e4c4c38f7482c7683ffe681562e26ca1cff09ac..3cf3d032bf4881d10f32f68a79208d4d9dae38bf 100644 --- a/spec/lib/gitlab/database/migration_helpers_spec.rb +++ b/spec/lib/gitlab/database/migration_helpers_spec.rb @@ -461,9 +461,9 @@ end it 'updates all the rows in a table' do - model.update_column_in_batches(:projects, :import_error, 'foo') + model.update_column_in_batches(:projects, :description_html, 'foo') - expect(Project.where(import_error: 'foo').count).to eq(5) + expect(Project.where(description_html: 'foo').count).to eq(5) end it 'updates boolean values correctly' do