Commit 449214c6 authored by Patrick Bair's avatar Patrick Bair

Merge branch 'remove-column-ignores-for-migrated-pk' into 'master'

Remove column ignore rules for migrated PKs

See merge request gitlab-org/gitlab!71161
parents 85179f78 6cf2a77e
......@@ -5,8 +5,6 @@ module Ci
include BulkInsertSafe
include IgnorableColumns
ignore_columns :build_id_convert_to_bigint, remove_with: '14.1', remove_after: '2021-07-22'
belongs_to :build, class_name: "Ci::Processable", foreign_key: :build_id, inverse_of: :needs
validates :build, presence: true
......
......@@ -6,8 +6,6 @@ module Ci
class BuildRunnerSession < Ci::ApplicationRecord
include IgnorableColumns
ignore_columns :build_id_convert_to_bigint, remove_with: '14.1', remove_after: '2021-07-22'
TERMINAL_SUBPROTOCOL = 'terminal.gitlab.com'
DEFAULT_SERVICE_NAME = 'build'
DEFAULT_PORT_NAME = 'default_port'
......
......@@ -9,8 +9,6 @@ module Ci
include ::Gitlab::OptimisticLocking
include IgnorableColumns
ignore_columns :build_id_convert_to_bigint, remove_with: '14.1', remove_after: '2021-07-22'
belongs_to :build, class_name: "Ci::Build", foreign_key: :build_id
default_value_for :data_store, :redis_trace_chunks
......
......@@ -8,8 +8,6 @@ module Ci
include Presentable
include IgnorableColumns
ignore_column :id_convert_to_bigint, remove_with: '14.2', remove_after: '2021-08-22'
enum status: Ci::HasStatus::STATUSES_ENUM
belongs_to :project
......
......@@ -10,8 +10,6 @@ class Deployment < ApplicationRecord
include FastDestroyAll
include IgnorableColumns
ignore_column :deployable_id_convert_to_bigint, remove_with: '14.2', remove_after: '2021-08-22'
belongs_to :project, required: true
belongs_to :environment, required: true
belongs_to :cluster, class_name: 'Clusters::Cluster', optional: true
......
......@@ -7,8 +7,6 @@ module Geo
include BulkInsertSafe
include IgnorableColumns
ignore_column :job_artifact_id_convert_to_bigint, remove_with: '14.2', remove_after: '2021-08-22'
belongs_to :job_artifact, class_name: 'Ci::JobArtifact'
validates :job_artifact, :file_path, presence: true
......
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