diff options
| author | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-04-07 15:56:08 +0200 |
|---|---|---|
| committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-04-11 13:14:15 +0200 |
| commit | 962bf01e69add14bceb3a901a143fcfba486abf3 (patch) | |
| tree | 58e19fa5081a6aa1a0f34614eec785075905e9eb /db | |
| parent | c98add157732004d9a2eaa39770edf84eaca6896 (diff) | |
| download | gitlab-ce-962bf01e69add14bceb3a901a143fcfba486abf3.tar.gz | |
Add foreign key on trigger requestszj-fk-ci-triggers
I started out as I missed the foreign key on ci_triggers and projects.
However, it seemed Yorick caught this already on gitlab-org/gitlab-ce!9388.
Still I found a missing foreign key, between the trigger requests and
triggers. This commit adds it, and removes the depend: :destroy on the
Rails model Ci::Triggers
Diffstat (limited to 'db')
| -rw-r--r-- | db/migrate/20170407135259_add_foreigh_key_trigger_requests_trigger.rb | 15 | ||||
| -rw-r--r-- | db/schema.rb | 2 |
2 files changed, 17 insertions, 0 deletions
diff --git a/db/migrate/20170407135259_add_foreigh_key_trigger_requests_trigger.rb b/db/migrate/20170407135259_add_foreigh_key_trigger_requests_trigger.rb new file mode 100644 index 00000000000..81761c65a9f --- /dev/null +++ b/db/migrate/20170407135259_add_foreigh_key_trigger_requests_trigger.rb @@ -0,0 +1,15 @@ +class AddForeighKeyTriggerRequestsTrigger < ActiveRecord::Migration + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + disable_ddl_transaction! + + def up + add_concurrent_foreign_key(:ci_trigger_requests, :ci_triggers, column: :trigger_id) + end + + def down + remove_foreign_key(:ci_trigger_requests, column: :trigger_id) + end +end diff --git a/db/schema.rb b/db/schema.rb index 3422847d729..5689f7331dc 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -12,6 +12,7 @@ # It's strongly recommended that you check this file into your version control system. ActiveRecord::Schema.define(version: 20170408033905) do + # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" enable_extension "pg_trgm" @@ -1356,6 +1357,7 @@ ActiveRecord::Schema.define(version: 20170408033905) do add_foreign_key "chat_teams", "namespaces", on_delete: :cascade add_foreign_key "ci_builds", "ci_pipelines", column: "auto_canceled_by_id", name: "fk_a2141b1522", on_delete: :nullify add_foreign_key "ci_pipelines", "ci_pipelines", column: "auto_canceled_by_id", name: "fk_262d4c2d19", on_delete: :nullify + add_foreign_key "ci_trigger_requests", "ci_triggers", column: "trigger_id", name: "fk_b8ec8b7245", on_delete: :cascade add_foreign_key "ci_trigger_schedules", "ci_triggers", column: "trigger_id", name: "fk_90a406cc94", on_delete: :cascade add_foreign_key "ci_triggers", "users", column: "owner_id", name: "fk_e8e10d1964", on_delete: :cascade add_foreign_key "container_repositories", "projects" |