Revert column name change
This commit is contained in:
parent
8327ad8d8e
commit
787eddd55d
4 changed files with 8 additions and 8 deletions
|
@ -14,7 +14,7 @@ module Ci
|
||||||
belongs_to :auto_canceled_by, class_name: 'Ci::Pipeline'
|
belongs_to :auto_canceled_by, class_name: 'Ci::Pipeline'
|
||||||
belongs_to :pipeline_schedule, class_name: 'Ci::PipelineSchedule'
|
belongs_to :pipeline_schedule, class_name: 'Ci::PipelineSchedule'
|
||||||
|
|
||||||
has_internal_id :iid_per_project, scope: :project, init: ->(s) { s&.project&.pipelines.count }
|
has_internal_id :iid, scope: :project, init: ->(s) { s&.project&.pipelines.count }
|
||||||
|
|
||||||
has_many :stages
|
has_many :stages
|
||||||
has_many :statuses, class_name: 'CommitStatus', foreign_key: :commit_id, inverse_of: :pipeline
|
has_many :statuses, class_name: 'CommitStatus', foreign_key: :commit_id, inverse_of: :pipeline
|
||||||
|
@ -492,7 +492,7 @@ module Ci
|
||||||
def predefined_variables
|
def predefined_variables
|
||||||
Gitlab::Ci::Variables::Collection.new
|
Gitlab::Ci::Variables::Collection.new
|
||||||
.append(key: 'CI_PIPELINE_ID', value: id.to_s)
|
.append(key: 'CI_PIPELINE_ID', value: id.to_s)
|
||||||
.append(key: 'CI_PIPELINE_IID_PER_PROJECT', value: iid_per_project.to_s)
|
.append(key: 'CI_PIPELINE_IID_PER_PROJECT', value: iid.to_s)
|
||||||
.append(key: 'CI_CONFIG_PATH', value: ci_yaml_file_path)
|
.append(key: 'CI_CONFIG_PATH', value: ci_yaml_file_path)
|
||||||
.append(key: 'CI_PIPELINE_SOURCE', value: source.to_s)
|
.append(key: 'CI_PIPELINE_SOURCE', value: source.to_s)
|
||||||
end
|
end
|
||||||
|
|
|
@ -6,10 +6,10 @@ class AddPipelineIidToCiPipelines < ActiveRecord::Migration
|
||||||
disable_ddl_transaction!
|
disable_ddl_transaction!
|
||||||
|
|
||||||
def up
|
def up
|
||||||
add_column :ci_pipelines, :iid_per_project, :integer
|
add_column :ci_pipelines, :iid, :integer
|
||||||
end
|
end
|
||||||
|
|
||||||
def down
|
def down
|
||||||
remove_column :ci_pipelines, :iid_per_project, :integer
|
remove_column :ci_pipelines, :iid, :integer
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -6,10 +6,10 @@ class AddIndexConstraintsToPipelineIid < ActiveRecord::Migration
|
||||||
disable_ddl_transaction!
|
disable_ddl_transaction!
|
||||||
|
|
||||||
def up
|
def up
|
||||||
add_concurrent_index :ci_pipelines, [:project_id, :iid_per_project], unique: true, where: 'iid_per_project IS NOT NULL'
|
add_concurrent_index :ci_pipelines, [:project_id, :iid], unique: true, where: 'iid IS NOT NULL'
|
||||||
end
|
end
|
||||||
|
|
||||||
def down
|
def down
|
||||||
remove_concurrent_index :ci_pipelines, [:project_id, :iid_per_project]
|
remove_concurrent_index :ci_pipelines, [:project_id, :iid]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -434,12 +434,12 @@ ActiveRecord::Schema.define(version: 20180425205249) do
|
||||||
t.integer "config_source"
|
t.integer "config_source"
|
||||||
t.boolean "protected"
|
t.boolean "protected"
|
||||||
t.integer "failure_reason"
|
t.integer "failure_reason"
|
||||||
t.integer "iid_per_project"
|
t.integer "iid"
|
||||||
end
|
end
|
||||||
|
|
||||||
add_index "ci_pipelines", ["auto_canceled_by_id"], name: "index_ci_pipelines_on_auto_canceled_by_id", using: :btree
|
add_index "ci_pipelines", ["auto_canceled_by_id"], name: "index_ci_pipelines_on_auto_canceled_by_id", using: :btree
|
||||||
add_index "ci_pipelines", ["pipeline_schedule_id"], name: "index_ci_pipelines_on_pipeline_schedule_id", using: :btree
|
add_index "ci_pipelines", ["pipeline_schedule_id"], name: "index_ci_pipelines_on_pipeline_schedule_id", using: :btree
|
||||||
add_index "ci_pipelines", ["project_id", "iid_per_project"], name: "index_ci_pipelines_on_project_id_and_iid_per_project", unique: true, where: "(iid_per_project IS NOT NULL)", using: :btree
|
add_index "ci_pipelines", ["project_id", "iid"], name: "index_ci_pipelines_on_project_id_and_iid", unique: true, where: "(iid IS NOT NULL)", using: :btree
|
||||||
add_index "ci_pipelines", ["project_id", "ref", "status", "id"], name: "index_ci_pipelines_on_project_id_and_ref_and_status_and_id", using: :btree
|
add_index "ci_pipelines", ["project_id", "ref", "status", "id"], name: "index_ci_pipelines_on_project_id_and_ref_and_status_and_id", using: :btree
|
||||||
add_index "ci_pipelines", ["project_id", "sha"], name: "index_ci_pipelines_on_project_id_and_sha", using: :btree
|
add_index "ci_pipelines", ["project_id", "sha"], name: "index_ci_pipelines_on_project_id_and_sha", using: :btree
|
||||||
add_index "ci_pipelines", ["project_id"], name: "index_ci_pipelines_on_project_id", using: :btree
|
add_index "ci_pipelines", ["project_id"], name: "index_ci_pipelines_on_project_id", using: :btree
|
||||||
|
|
Loading…
Reference in a new issue