Commit 9498a400 authored by Kamil Trzcinski's avatar Kamil Trzcinski

Fix migrations

parent 0f3deac3
class MigrateProjectIdForCiCommits < ActiveRecord::Migration class MigrateProjectIdForCiCommits < ActiveRecord::Migration
def up def up
execute( subquery = 'SELECT gitlab_id FROM ci_projects WHERE ci_projects.id = ci_commits.project_id'
"UPDATE ci_commits " + execute("UPDATE ci_commits SET gl_project_id=(#{subquery}) WHERE gl_project_id IS NULL")
"JOIN ci_projects ON ci_projects.id = ci_commits.project_id " +
"SET gl_project_id=ci_projects.gitlab_id " +
"WHERE gl_project_id IS NULL"
)
end end
end end
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
# #
# It's strongly recommended that you check this file into your version control system. # It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20150924131004) do ActiveRecord::Schema.define(version: 20150924125436) do
# These are extensions that must be enabled in order to support this database # These are extensions that must be enabled in order to support this database
enable_extension "plpgsql" enable_extension "plpgsql"
...@@ -45,8 +45,8 @@ ActiveRecord::Schema.define(version: 20150924131004) do ...@@ -45,8 +45,8 @@ ActiveRecord::Schema.define(version: 20150924131004) do
t.string "after_sign_out_path" t.string "after_sign_out_path"
t.integer "session_expire_delay", default: 10080, null: false t.integer "session_expire_delay", default: 10080, null: false
t.text "import_sources" t.text "import_sources"
t.boolean "ci_enabled", default: true, null: false
t.text "help_page_text" t.text "help_page_text"
t.boolean "ci_enabled", default: true, null: false
end end
create_table "audit_events", force: true do |t| create_table "audit_events", force: true do |t|
...@@ -100,7 +100,6 @@ ActiveRecord::Schema.define(version: 20150924131004) do ...@@ -100,7 +100,6 @@ ActiveRecord::Schema.define(version: 20150924131004) do
t.boolean "allow_failure", default: false, null: false t.boolean "allow_failure", default: false, null: false
t.string "stage" t.string "stage"
t.integer "trigger_request_id" t.integer "trigger_request_id"
t.integer "gl_project_id"
end end
add_index "ci_builds", ["commit_id"], name: "index_ci_builds_on_commit_id", using: :btree add_index "ci_builds", ["commit_id"], name: "index_ci_builds_on_commit_id", using: :btree
...@@ -135,7 +134,6 @@ ActiveRecord::Schema.define(version: 20150924131004) do ...@@ -135,7 +134,6 @@ ActiveRecord::Schema.define(version: 20150924131004) do
t.text "description" t.text "description"
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
t.integer "gl_project_id"
end end
add_index "ci_events", ["created_at"], name: "index_ci_events_on_created_at", using: :btree add_index "ci_events", ["created_at"], name: "index_ci_events_on_created_at", using: :btree
...@@ -187,7 +185,6 @@ ActiveRecord::Schema.define(version: 20150924131004) do ...@@ -187,7 +185,6 @@ ActiveRecord::Schema.define(version: 20150924131004) do
t.integer "project_id", null: false t.integer "project_id", null: false
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
t.integer "gl_project_id"
end end
add_index "ci_runner_projects", ["project_id"], name: "index_ci_runner_projects_on_project_id", using: :btree add_index "ci_runner_projects", ["project_id"], name: "index_ci_runner_projects_on_project_id", using: :btree
...@@ -216,7 +213,6 @@ ActiveRecord::Schema.define(version: 20150924131004) do ...@@ -216,7 +213,6 @@ ActiveRecord::Schema.define(version: 20150924131004) do
t.datetime "updated_at" t.datetime "updated_at"
t.boolean "active", default: false, null: false t.boolean "active", default: false, null: false
t.text "properties" t.text "properties"
t.integer "gl_project_id"
end end
add_index "ci_services", ["project_id"], name: "index_ci_services_on_project_id", using: :btree add_index "ci_services", ["project_id"], name: "index_ci_services_on_project_id", using: :btree
...@@ -265,7 +261,6 @@ ActiveRecord::Schema.define(version: 20150924131004) do ...@@ -265,7 +261,6 @@ ActiveRecord::Schema.define(version: 20150924131004) do
t.datetime "deleted_at" t.datetime "deleted_at"
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
t.integer "gl_project_id"
end end
add_index "ci_triggers", ["deleted_at"], name: "index_ci_triggers_on_deleted_at", using: :btree add_index "ci_triggers", ["deleted_at"], name: "index_ci_triggers_on_deleted_at", using: :btree
...@@ -277,7 +272,6 @@ ActiveRecord::Schema.define(version: 20150924131004) do ...@@ -277,7 +272,6 @@ ActiveRecord::Schema.define(version: 20150924131004) do
t.text "encrypted_value" t.text "encrypted_value"
t.string "encrypted_value_salt" t.string "encrypted_value_salt"
t.string "encrypted_value_iv" t.string "encrypted_value_iv"
t.integer "gl_project_id"
end end
add_index "ci_variables", ["project_id"], name: "index_ci_variables_on_project_id", using: :btree add_index "ci_variables", ["project_id"], name: "index_ci_variables_on_project_id", using: :btree
...@@ -287,7 +281,6 @@ ActiveRecord::Schema.define(version: 20150924131004) do ...@@ -287,7 +281,6 @@ ActiveRecord::Schema.define(version: 20150924131004) do
t.integer "project_id", null: false t.integer "project_id", null: false
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
t.integer "gl_project_id"
end end
create_table "deploy_keys_projects", force: true do |t| create_table "deploy_keys_projects", force: true do |t|
...@@ -606,7 +599,6 @@ ActiveRecord::Schema.define(version: 20150924131004) do ...@@ -606,7 +599,6 @@ ActiveRecord::Schema.define(version: 20150924131004) do
t.string "import_type" t.string "import_type"
t.string "import_source" t.string "import_source"
t.integer "commit_count", default: 0 t.integer "commit_count", default: 0
t.boolean "shared_runners_enabled", default: false
end end
add_index "projects", ["created_at", "id"], name: "index_projects_on_created_at_and_id", using: :btree add_index "projects", ["created_at", "id"], name: "index_projects_on_created_at_and_id", using: :btree
......
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