diff options
| author | ThibG <thib@sitedethib.com> | 2019-01-02 20:03:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-02 20:03:32 +0100 |
| commit | 0acd51acdc1e670bf57f58671cb8e30743782c63 (patch) | |
| tree | f5ff0b5c3b1e8fd94691264f2bc147e5fa233ecb /db/schema.rb | |
| parent | b300948526d967aaf5608c93546ee0d54940c0ef (diff) | |
| parent | e77ceb1b29547ed89b4110b3cc3edc9ac325b620 (diff) | |
Merge pull request #878 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'db/schema.rb')
| -rw-r--r-- | db/schema.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/db/schema.rb b/db/schema.rb index 4bfb836e2..48ffea3dd 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2018_12_13_185533) do +ActiveRecord::Schema.define(version: 2018_12_19_235220) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -649,8 +649,10 @@ ActiveRecord::Schema.define(version: 2018_12_13_185533) do t.bigint "invite_id" t.string "remember_token" t.string "chosen_languages", array: true + t.bigint "created_by_application_id" t.index ["account_id"], name: "index_users_on_account_id" t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true + t.index ["created_by_application_id"], name: "index_users_on_created_by_application_id" t.index ["email"], name: "index_users_on_email", unique: true t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true end @@ -744,6 +746,7 @@ ActiveRecord::Schema.define(version: 2018_12_13_185533) do add_foreign_key "subscriptions", "accounts", name: "fk_9847d1cbb5", on_delete: :cascade add_foreign_key "users", "accounts", name: "fk_50500f500d", on_delete: :cascade add_foreign_key "users", "invites", on_delete: :nullify + add_foreign_key "users", "oauth_applications", column: "created_by_application_id", on_delete: :nullify add_foreign_key "web_push_subscriptions", "oauth_access_tokens", column: "access_token_id", on_delete: :cascade add_foreign_key "web_push_subscriptions", "users", on_delete: :cascade add_foreign_key "web_settings", "users", name: "fk_11910667b2", on_delete: :cascade |