diff options
author | ThibG <thib@sitedethib.com> | 2020-07-01 00:18:49 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-01 00:18:49 +0200 |
commit | 814d3f343f8caae3366410900eec0b90b9bbbb7b (patch) | |
tree | 5d0b779a144afd2bff33503804cd5dcc58012ff6 /db/schema.rb | |
parent | 10ede3eb27c5de5d4e3a283e333af2a54da6177d (diff) | |
parent | 3d7ce178dd7be9ef02d34bf6734365d0aefa3120 (diff) |
Merge pull request #1366 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'db/schema.rb')
-rw-r--r-- | db/schema.rb | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/db/schema.rb b/db/schema.rb index 14072229a..ee6954813 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: 2020_06_20_164023) do +ActiveRecord::Schema.define(version: 2020_06_28_133322) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -490,6 +490,11 @@ ActiveRecord::Schema.define(version: 2020_06_20_164023) do t.string "blurhash" t.integer "processing" t.integer "file_storage_schema_version" + t.string "thumbnail_file_name" + t.string "thumbnail_content_type" + t.integer "thumbnail_file_size" + t.datetime "thumbnail_updated_at" + t.string "thumbnail_remote_url" t.index ["account_id"], name: "index_media_attachments_on_account_id" t.index ["scheduled_status_id"], name: "index_media_attachments_on_scheduled_status_id" t.index ["shortcode"], name: "index_media_attachments_on_shortcode", unique: true @@ -831,6 +836,16 @@ ActiveRecord::Schema.define(version: 2020_06_20_164023) do t.index ["user_id"], name: "index_user_invite_requests_on_user_id" end + create_table "account_notes", force: :cascade do |t| + t.bigint "account_id" + t.bigint "target_account_id" + t.text "comment", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["account_id", "target_account_id"], name: "index_account_notes_on_account_id_and_target_account_id", unique: true + t.index ["target_account_id"], name: "index_account_notes_on_target_account_id" + end + create_table "users", force: :cascade do |t| t.string "email", default: "", null: false t.datetime "created_at", null: false @@ -987,6 +1002,8 @@ ActiveRecord::Schema.define(version: 2020_06_20_164023) do add_foreign_key "statuses_tags", "tags", name: "fk_3081861e21", on_delete: :cascade add_foreign_key "tombstones", "accounts", on_delete: :cascade add_foreign_key "user_invite_requests", "users", on_delete: :cascade + add_foreign_key "account_notes", "accounts", column: "target_account_id", on_delete: :cascade + add_foreign_key "account_notes", "accounts", 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 |