Commit d9708d6c authored by Krasimir Angelov's avatar Krasimir Angelov Committed by pbair

Remove column ignore rules for migrated PKs

Remove column ignore rules for ci_builds, ci_builds_metadata,
ci_job_artifacts, ci_sources_pipelines, events, push_event_payloads, and
taggings:

* https://gitlab.com/gitlab-org/gitlab/-/issues/338067
* https://gitlab.com/gitlab-org/gitlab/-/issues/338070
* https://gitlab.com/gitlab-org/gitlab/-/issues/338068
* https://gitlab.com/gitlab-org/gitlab/-/issues/338059
* https://gitlab.com/gitlab-org/gitlab/-/issues/338072
* https://gitlab.com/gitlab-org/gitlab/-/issues/338071
* https://gitlab.com/gitlab-org/gitlab/-/issues/338055

All columns were removed in 14.4.
parent 62ff6345
...@@ -10,7 +10,6 @@ module Ci ...@@ -10,7 +10,6 @@ module Ci
include Presentable include Presentable
include Importable include Importable
include Ci::HasRef include Ci::HasRef
include IgnorableColumns
BuildArchivedError = Class.new(StandardError) BuildArchivedError = Class.new(StandardError)
...@@ -70,9 +69,6 @@ module Ci ...@@ -70,9 +69,6 @@ module Ci
delegate :gitlab_deploy_token, to: :project delegate :gitlab_deploy_token, to: :project
delegate :trigger_short_token, to: :trigger_request, allow_nil: true delegate :trigger_short_token, to: :trigger_request, allow_nil: true
ignore_columns :id_convert_to_bigint, remove_with: '14.5', remove_after: '2021-10-22'
ignore_columns :stage_id_convert_to_bigint, remove_with: '14.5', remove_after: '2021-10-22'
## ##
# Since Gitlab 11.5, deployments records started being created right after # Since Gitlab 11.5, deployments records started being created right after
# `ci_builds` creation. We can look up a relevant `environment` through # `ci_builds` creation. We can look up a relevant `environment` through
......
...@@ -37,8 +37,6 @@ module Ci ...@@ -37,8 +37,6 @@ module Ci
job_timeout_source: 4 job_timeout_source: 4
} }
ignore_column :build_id_convert_to_bigint, remove_with: '14.5', remove_after: '2021-10-22'
ignore_columns :id_convert_to_bigint, remove_with: '14.5', remove_after: '2021-10-22'
ignore_columns :runner_features, remove_with: '14.7', remove_after: '2021-11-22' ignore_columns :runner_features, remove_with: '14.7', remove_after: '2021-11-22'
def update_timeout_state def update_timeout_state
......
...@@ -10,9 +10,6 @@ module Ci ...@@ -10,9 +10,6 @@ module Ci
include Artifactable include Artifactable
include FileStoreMounter include FileStoreMounter
include EachBatch include EachBatch
include IgnorableColumns
ignore_columns %i[id_convert_to_bigint job_id_convert_to_bigint], remove_with: '14.5', remove_after: '2021-11-22'
TEST_REPORT_FILE_TYPES = %w[junit].freeze TEST_REPORT_FILE_TYPES = %w[junit].freeze
COVERAGE_REPORT_FILE_TYPES = %w[cobertura].freeze COVERAGE_REPORT_FILE_TYPES = %w[cobertura].freeze
......
...@@ -4,9 +4,6 @@ module Ci ...@@ -4,9 +4,6 @@ module Ci
module Sources module Sources
class Pipeline < Ci::ApplicationRecord class Pipeline < Ci::ApplicationRecord
include Ci::NamespacedModelName include Ci::NamespacedModelName
include IgnorableColumns
ignore_columns 'source_job_id_convert_to_bigint', remove_with: '14.5', remove_after: '2021-11-22'
self.table_name = "ci_sources_pipelines" self.table_name = "ci_sources_pipelines"
......
...@@ -9,9 +9,6 @@ class Event < ApplicationRecord ...@@ -9,9 +9,6 @@ class Event < ApplicationRecord
include Gitlab::Utils::StrongMemoize include Gitlab::Utils::StrongMemoize
include UsageStatistics include UsageStatistics
include ShaAttribute include ShaAttribute
include IgnorableColumns
ignore_columns :id_convert_to_bigint, remove_with: '14.5', remove_after: '2021-10-22'
default_scope { reorder(nil) } # rubocop:disable Cop/DefaultScope default_scope { reorder(nil) } # rubocop:disable Cop/DefaultScope
......
...@@ -2,9 +2,6 @@ ...@@ -2,9 +2,6 @@
class PushEventPayload < ApplicationRecord class PushEventPayload < ApplicationRecord
extend SuppressCompositePrimaryKeyWarning extend SuppressCompositePrimaryKeyWarning
include IgnorableColumns
ignore_columns :event_id_convert_to_bigint, remove_with: '14.4', remove_after: '2021-10-22'
include ShaAttribute include ShaAttribute
......
...@@ -9,7 +9,3 @@ ActsAsTaggableOn.tags_counter = false ...@@ -9,7 +9,3 @@ ActsAsTaggableOn.tags_counter = false
# validate that counter cache is disabled # validate that counter cache is disabled
raise "Counter cache is not disabled" if raise "Counter cache is not disabled" if
ActsAsTaggableOn::Tagging.reflections["tag"].options[:counter_cache] ActsAsTaggableOn::Tagging.reflections["tag"].options[:counter_cache]
ActsAsTaggableOn::Tagging.include IgnorableColumns
ActsAsTaggableOn::Tagging.ignore_column :id_convert_to_bigint, remove_with: '14.5', remove_after: '2021-10-22'
ActsAsTaggableOn::Tagging.ignore_column :taggable_id_convert_to_bigint, remove_with: '14.5', remove_after: '2021-10-22'
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment