summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2018-04-25 22:00:11 +0900
committerKamil TrzciƄski <ayufan@ayufan.eu>2018-05-03 10:48:33 +0200
commit787eddd55d3699c73a69c99eb66e6a4b3b63b330 (patch)
tree2ba4bce3f4df33345e90af1c28baad4b685df8ca /db
parent8327ad8d8edffe17870571aff1dd68a6c0bce9e7 (diff)
downloadgitlab-ce-787eddd55d3699c73a69c99eb66e6a4b3b63b330.tar.gz
Revert column name change
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20180424160449_add_pipeline_iid_to_ci_pipelines.rb4
-rw-r--r--db/migrate/20180425205249_add_index_constraints_to_pipeline_iid.rb4
-rw-r--r--db/schema.rb4
3 files changed, 6 insertions, 6 deletions
diff --git a/db/migrate/20180424160449_add_pipeline_iid_to_ci_pipelines.rb b/db/migrate/20180424160449_add_pipeline_iid_to_ci_pipelines.rb
index 128377e1c9d..d732116e9ce 100644
--- a/db/migrate/20180424160449_add_pipeline_iid_to_ci_pipelines.rb
+++ b/db/migrate/20180424160449_add_pipeline_iid_to_ci_pipelines.rb
@@ -6,10 +6,10 @@ class AddPipelineIidToCiPipelines < ActiveRecord::Migration
disable_ddl_transaction!
def up
- add_column :ci_pipelines, :iid_per_project, :integer
+ add_column :ci_pipelines, :iid, :integer
end
def down
- remove_column :ci_pipelines, :iid_per_project, :integer
+ remove_column :ci_pipelines, :iid, :integer
end
end
diff --git a/db/migrate/20180425205249_add_index_constraints_to_pipeline_iid.rb b/db/migrate/20180425205249_add_index_constraints_to_pipeline_iid.rb
index 7daa7197b7c..3fa59b44d5d 100644
--- a/db/migrate/20180425205249_add_index_constraints_to_pipeline_iid.rb
+++ b/db/migrate/20180425205249_add_index_constraints_to_pipeline_iid.rb
@@ -6,10 +6,10 @@ class AddIndexConstraintsToPipelineIid < ActiveRecord::Migration
disable_ddl_transaction!
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
def down
- remove_concurrent_index :ci_pipelines, [:project_id, :iid_per_project]
+ remove_concurrent_index :ci_pipelines, [:project_id, :iid]
end
end
diff --git a/db/schema.rb b/db/schema.rb
index af838e109b2..50abe1a8838 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -434,12 +434,12 @@ ActiveRecord::Schema.define(version: 20180425205249) do
t.integer "config_source"
t.boolean "protected"
t.integer "failure_reason"
- t.integer "iid_per_project"
+ t.integer "iid"
end
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", ["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", "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