diff options
author | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-03-06 08:55:30 +0100 |
---|---|---|
committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-03-06 08:55:30 +0100 |
commit | b3aae422a6adbc0e46901a0c9dde5b75b791e060 (patch) | |
tree | d93e28c1b502e777ec89f4a2af6c9ec3ec91ea3c /db | |
parent | 28910ffddf348f98b470462a0b354234774bf4f5 (diff) | |
download | gitlab-ce-b3aae422a6adbc0e46901a0c9dde5b75b791e060.tar.gz |
Minor edits, incorporate review
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20170120131253_create_chat_teams.rb | 4 | ||||
-rw-r--r-- | db/schema.rb | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/db/migrate/20170120131253_create_chat_teams.rb b/db/migrate/20170120131253_create_chat_teams.rb index 699226d60c9..7995d383986 100644 --- a/db/migrate/20170120131253_create_chat_teams.rb +++ b/db/migrate/20170120131253_create_chat_teams.rb @@ -8,13 +8,11 @@ class CreateChatTeams < ActiveRecord::Migration def change create_table :chat_teams do |t| - t.integer :namespace_id, index: true + t.references :namespace, null: false, index: { unique: true }, foreign_key: { on_delete: :cascade } t.string :team_id t.string :name t.timestamps null: false end - - add_concurrent_foreign_key :chat_teams, :namespaces, column: :namespace_id end end diff --git a/db/schema.rb b/db/schema.rb index f42b20652a0..43ca05fad8c 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -173,14 +173,14 @@ ActiveRecord::Schema.define(version: 20170217151947) do add_index "chat_names", ["user_id", "service_id"], name: "index_chat_names_on_user_id_and_service_id", unique: true, using: :btree create_table "chat_teams", force: :cascade do |t| - t.integer "namespace_id" + t.integer "namespace_id", null: false t.string "team_id" t.string "name" t.datetime "created_at", null: false t.datetime "updated_at", null: false end - add_index "chat_teams", ["namespace_id"], name: "index_chat_teams_on_namespace_id", using: :btree + add_index "chat_teams", ["namespace_id"], name: "index_chat_teams_on_namespace_id", unique: true, using: :btree create_table "ci_application_settings", force: :cascade do |t| t.boolean "all_broken_builds" @@ -1343,7 +1343,7 @@ ActiveRecord::Schema.define(version: 20170217151947) do add_index "web_hooks", ["project_id"], name: "index_web_hooks_on_project_id", using: :btree add_foreign_key "boards", "projects" - add_foreign_key "chat_teams", "namespaces", name: "fk_3b543909cb", on_delete: :cascade + add_foreign_key "chat_teams", "namespaces", on_delete: :cascade add_foreign_key "issue_metrics", "issues", on_delete: :cascade add_foreign_key "label_priorities", "labels", on_delete: :cascade add_foreign_key "label_priorities", "projects", on_delete: :cascade |