Add index to media_attachments.account_id (#3510)

2 files changed, 268 insertions, 262 deletions

diff --git a/db/migrate/20170601210557_add_index_on_media_attachments_account_id.rb b/db/migrate/20170601210557_add_index_on_media_attachments_account_id.rb
new file mode 100644
index 000000000..c51ab28e5
--- /dev/null
+++ b/db/migrate/20170601210557_add_index_on_media_attachments_account_id.rb
@@ -0,0 +1,5 @@
+class AddIndexOnMediaAttachmentsAccountId < ActiveRecord::Migration[5.1]
+  def change
+    add_index :media_attachments, :account_id
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 33c833615..c79258cf7 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,360 +10,361 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170520145338) do
+ActiveRecord::Schema.define(version: 20170601210557) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
-  create_table "account_domain_blocks", force: :cascade do |t|
-    t.integer  "account_id"
-    t.string   "domain"
+  create_table "account_domain_blocks", id: :serial, force: :cascade do |t|
+    t.integer "account_id"
+    t.string "domain"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.index ["account_id", "domain"], name: "index_account_domain_blocks_on_account_id_and_domain", unique: true, using: :btree
+    t.index ["account_id", "domain"], name: "index_account_domain_blocks_on_account_id_and_domain", unique: true
   end
 
-  create_table "accounts", force: :cascade do |t|
-    t.string   "username",                default: "",    null: false
-    t.string   "domain"
-    t.string   "secret",                  default: "",    null: false
-    t.text     "private_key"
-    t.text     "public_key",              default: "",    null: false
-    t.string   "remote_url",              default: "",    null: false
-    t.string   "salmon_url",              default: "",    null: false
-    t.string   "hub_url",                 default: "",    null: false
-    t.datetime "created_at",                              null: false
-    t.datetime "updated_at",                              null: false
-    t.text     "note",                    default: "",    null: false
-    t.string   "display_name",            default: "",    null: false
-    t.string   "uri",                     default: "",    null: false
-    t.string   "url"
-    t.string   "avatar_file_name"
-    t.string   "avatar_content_type"
-    t.integer  "avatar_file_size"
+  create_table "accounts", id: :serial, force: :cascade do |t|
+    t.string "username", default: "", null: false
+    t.string "domain"
+    t.string "secret", default: "", null: false
+    t.text "private_key"
+    t.text "public_key", default: "", null: false
+    t.string "remote_url", default: "", null: false
+    t.string "salmon_url", default: "", null: false
+    t.string "hub_url", default: "", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.text "note", default: "", null: false
+    t.string "display_name", default: "", null: false
+    t.string "uri", default: "", null: false
+    t.string "url"
+    t.string "avatar_file_name"
+    t.string "avatar_content_type"
+    t.integer "avatar_file_size"
     t.datetime "avatar_updated_at"
-    t.string   "header_file_name"
-    t.string   "header_content_type"
-    t.integer  "header_file_size"
+    t.string "header_file_name"
+    t.string "header_content_type"
+    t.integer "header_file_size"
     t.datetime "header_updated_at"
-    t.string   "avatar_remote_url"
+    t.string "avatar_remote_url"
     t.datetime "subscription_expires_at"
-    t.boolean  "silenced",                default: false, null: false
-    t.boolean  "suspended",               default: false, null: false
-    t.boolean  "locked",                  default: false, null: false
-    t.string   "header_remote_url",       default: "",    null: false
-    t.integer  "statuses_count",          default: 0,     null: false
-    t.integer  "followers_count",         default: 0,     null: false
-    t.integer  "following_count",         default: 0,     null: false
+    t.boolean "silenced", default: false, null: false
+    t.boolean "suspended", default: false, null: false
+    t.boolean "locked", default: false, null: false
+    t.string "header_remote_url", default: "", null: false
+    t.integer "statuses_count", default: 0, null: false
+    t.integer "followers_count", default: 0, null: false
+    t.integer "following_count", default: 0, null: false
     t.datetime "last_webfingered_at"
     t.index "(((setweight(to_tsvector('simple'::regconfig, (display_name)::text), 'A'::\"char\") || setweight(to_tsvector('simple'::regconfig, (username)::text), 'B'::\"char\")) || setweight(to_tsvector('simple'::regconfig, (COALESCE(domain, ''::character varying))::text), 'C'::\"char\")))", name: "search_index", using: :gin
-    t.index "lower((username)::text), lower((domain)::text)", name: "index_accounts_on_username_and_domain_lower", using: :btree
-    t.index ["uri"], name: "index_accounts_on_uri", using: :btree
-    t.index ["url"], name: "index_accounts_on_url", using: :btree
-    t.index ["username", "domain"], name: "index_accounts_on_username_and_domain", unique: true, using: :btree
+    t.index "lower((username)::text), lower((domain)::text)", name: "index_accounts_on_username_and_domain_lower"
+    t.index ["uri"], name: "index_accounts_on_uri"
+    t.index ["url"], name: "index_accounts_on_url"
+    t.index ["username", "domain"], name: "index_accounts_on_username_and_domain", unique: true
   end
 
-  create_table "blocks", force: :cascade do |t|
-    t.integer  "account_id",        null: false
-    t.integer  "target_account_id", null: false
-    t.datetime "created_at",        null: false
-    t.datetime "updated_at",        null: false
-    t.index ["account_id", "target_account_id"], name: "index_blocks_on_account_id_and_target_account_id", unique: true, using: :btree
+  create_table "blocks", id: :serial, force: :cascade do |t|
+    t.integer "account_id", null: false
+    t.integer "target_account_id", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["account_id", "target_account_id"], name: "index_blocks_on_account_id_and_target_account_id", unique: true
   end
 
-  create_table "conversation_mutes", force: :cascade do |t|
-    t.integer "account_id",      null: false
-    t.bigint  "conversation_id", null: false
-    t.index ["account_id", "conversation_id"], name: "index_conversation_mutes_on_account_id_and_conversation_id", unique: true, using: :btree
+  create_table "conversation_mutes", id: :serial, force: :cascade do |t|
+    t.integer "account_id", null: false
+    t.bigint "conversation_id", null: false
+    t.index ["account_id", "conversation_id"], name: "index_conversation_mutes_on_account_id_and_conversation_id", unique: true
   end
 
-  create_table "conversations", id: :bigserial, force: :cascade do |t|
-    t.string   "uri"
+  create_table "conversations", force: :cascade do |t|
+    t.string "uri"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.index ["uri"], name: "index_conversations_on_uri", unique: true, using: :btree
+    t.index ["uri"], name: "index_conversations_on_uri", unique: true
   end
 
-  create_table "domain_blocks", force: :cascade do |t|
-    t.string   "domain",       default: "", null: false
-    t.datetime "created_at",                null: false
-    t.datetime "updated_at",                null: false
-    t.integer  "severity",     default: 0
-    t.boolean  "reject_media"
-    t.index ["domain"], name: "index_domain_blocks_on_domain", unique: true, using: :btree
+  create_table "domain_blocks", id: :serial, force: :cascade do |t|
+    t.string "domain", default: "", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.integer "severity", default: 0
+    t.boolean "reject_media"
+    t.index ["domain"], name: "index_domain_blocks_on_domain", unique: true
   end
 
-  create_table "favourites", force: :cascade do |t|
-    t.integer  "account_id", null: false
-    t.integer  "status_id",  null: false
+  create_table "favourites", id: :serial, force: :cascade do |t|
+    t.integer "account_id", null: false
+    t.integer "status_id", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.index ["account_id", "status_id"], name: "index_favourites_on_account_id_and_status_id", unique: true, using: :btree
-    t.index ["status_id"], name: "index_favourites_on_status_id", using: :btree
+    t.index ["account_id", "status_id"], name: "index_favourites_on_account_id_and_status_id", unique: true
+    t.index ["status_id"], name: "index_favourites_on_status_id"
   end
 
-  create_table "follow_requests", force: :cascade do |t|
-    t.integer  "account_id",        null: false
-    t.integer  "target_account_id", null: false
-    t.datetime "created_at",        null: false
-    t.datetime "updated_at",        null: false
-    t.index ["account_id", "target_account_id"], name: "index_follow_requests_on_account_id_and_target_account_id", unique: true, using: :btree
+  create_table "follow_requests", id: :serial, force: :cascade do |t|
+    t.integer "account_id", null: false
+    t.integer "target_account_id", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["account_id", "target_account_id"], name: "index_follow_requests_on_account_id_and_target_account_id", unique: true
   end
 
-  create_table "follows", force: :cascade do |t|
-    t.integer  "account_id",        null: false
-    t.integer  "target_account_id", null: false
-    t.datetime "created_at",        null: false
-    t.datetime "updated_at",        null: false
-    t.index ["account_id", "target_account_id"], name: "index_follows_on_account_id_and_target_account_id", unique: true, using: :btree
+  create_table "follows", id: :serial, force: :cascade do |t|
+    t.integer "account_id", null: false
+    t.integer "target_account_id", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["account_id", "target_account_id"], name: "index_follows_on_account_id_and_target_account_id", unique: true
   end
 
-  create_table "imports", force: :cascade do |t|
-    t.integer  "account_id",        null: false
-    t.integer  "type",              null: false
-    t.boolean  "approved"
-    t.datetime "created_at",        null: false
-    t.datetime "updated_at",        null: false
-    t.string   "data_file_name"
-    t.string   "data_content_type"
-    t.integer  "data_file_size"
+  create_table "imports", id: :serial, force: :cascade do |t|
+    t.integer "account_id", null: false
+    t.integer "type", null: false
+    t.boolean "approved"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.string "data_file_name"
+    t.string "data_content_type"
+    t.integer "data_file_size"
     t.datetime "data_updated_at"
   end
 
-  create_table "media_attachments", force: :cascade do |t|
-    t.bigint   "status_id"
-    t.string   "file_file_name"
-    t.string   "file_content_type"
-    t.integer  "file_file_size"
+  create_table "media_attachments", id: :serial, force: :cascade do |t|
+    t.bigint "status_id"
+    t.string "file_file_name"
+    t.string "file_content_type"
+    t.integer "file_file_size"
     t.datetime "file_updated_at"
-    t.string   "remote_url",        default: "", null: false
-    t.integer  "account_id"
-    t.datetime "created_at",                     null: false
-    t.datetime "updated_at",                     null: false
-    t.string   "shortcode"
-    t.integer  "type",              default: 0,  null: false
-    t.json     "file_meta"
-    t.index ["shortcode"], name: "index_media_attachments_on_shortcode", unique: true, using: :btree
-    t.index ["status_id"], name: "index_media_attachments_on_status_id", using: :btree
+    t.string "remote_url", default: "", null: false
+    t.integer "account_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.string "shortcode"
+    t.integer "type", default: 0, null: false
+    t.json "file_meta"
+    t.index ["account_id"], name: "index_media_attachments_on_account_id"
+    t.index ["shortcode"], name: "index_media_attachments_on_shortcode", unique: true
+    t.index ["status_id"], name: "index_media_attachments_on_status_id"
   end
 
-  create_table "mentions", force: :cascade do |t|
-    t.integer  "account_id"
-    t.bigint   "status_id"
+  create_table "mentions", id: :serial, force: :cascade do |t|
+    t.integer "account_id"
+    t.bigint "status_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.index ["account_id", "status_id"], name: "index_mentions_on_account_id_and_status_id", unique: true, using: :btree
-    t.index ["status_id"], name: "index_mentions_on_status_id", using: :btree
+    t.index ["account_id", "status_id"], name: "index_mentions_on_account_id_and_status_id", unique: true
+    t.index ["status_id"], name: "index_mentions_on_status_id"
   end
 
-  create_table "mutes", force: :cascade do |t|
-    t.integer  "account_id",        null: false
-    t.integer  "target_account_id", null: false
-    t.datetime "created_at",        null: false
-    t.datetime "updated_at",        null: false
-    t.index ["account_id", "target_account_id"], name: "index_mutes_on_account_id_and_target_account_id", unique: true, using: :btree
+  create_table "mutes", id: :serial, force: :cascade do |t|
+    t.integer "account_id", null: false
+    t.integer "target_account_id", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["account_id", "target_account_id"], name: "index_mutes_on_account_id_and_target_account_id", unique: true
   end
 
-  create_table "notifications", force: :cascade do |t|
-    t.integer  "account_id"
-    t.bigint   "activity_id"
-    t.string   "activity_type"
-    t.datetime "created_at",      null: false
-    t.datetime "updated_at",      null: false
-    t.integer  "from_account_id"
-    t.index ["account_id", "activity_id", "activity_type"], name: "account_activity", unique: true, using: :btree
-    t.index ["activity_id", "activity_type"], name: "index_notifications_on_activity_id_and_activity_type", using: :btree
+  create_table "notifications", id: :serial, force: :cascade do |t|
+    t.integer "account_id"
+    t.bigint "activity_id"
+    t.string "activity_type"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.integer "from_account_id"
+    t.index ["account_id", "activity_id", "activity_type"], name: "account_activity", unique: true
+    t.index ["activity_id", "activity_type"], name: "index_notifications_on_activity_id_and_activity_type"
   end
 
-  create_table "oauth_access_grants", force: :cascade do |t|
-    t.integer  "resource_owner_id", null: false
-    t.integer  "application_id",    null: false
-    t.string   "token",             null: false
-    t.integer  "expires_in",        null: false
-    t.text     "redirect_uri",      null: false
-    t.datetime "created_at",        null: false
+  create_table "oauth_access_grants", id: :serial, force: :cascade do |t|
+    t.integer "resource_owner_id", null: false
+    t.integer "application_id", null: false
+    t.string "token", null: false
+    t.integer "expires_in", null: false
+    t.text "redirect_uri", null: false
+    t.datetime "created_at", null: false
     t.datetime "revoked_at"
-    t.string   "scopes"
-    t.index ["token"], name: "index_oauth_access_grants_on_token", unique: true, using: :btree
+    t.string "scopes"
+    t.index ["token"], name: "index_oauth_access_grants_on_token", unique: true
   end
 
-  create_table "oauth_access_tokens", force: :cascade do |t|
-    t.integer  "resource_owner_id"
-    t.integer  "application_id"
-    t.string   "token",             null: false
-    t.string   "refresh_token"
-    t.integer  "expires_in"
+  create_table "oauth_access_tokens", id: :serial, force: :cascade do |t|
+    t.integer "resource_owner_id"
+    t.integer "application_id"
+    t.string "token", null: false
+    t.string "refresh_token"
+    t.integer "expires_in"
     t.datetime "revoked_at"
-    t.datetime "created_at",        null: false
-    t.string   "scopes"
-    t.index ["refresh_token"], name: "index_oauth_access_tokens_on_refresh_token", unique: true, using: :btree
-    t.index ["resource_owner_id"], name: "index_oauth_access_tokens_on_resource_owner_id", using: :btree
-    t.index ["token"], name: "index_oauth_access_tokens_on_token", unique: true, using: :btree
+    t.datetime "created_at", null: false
+    t.string "scopes"
+    t.index ["refresh_token"], name: "index_oauth_access_tokens_on_refresh_token", unique: true
+    t.index ["resource_owner_id"], name: "index_oauth_access_tokens_on_resource_owner_id"
+    t.index ["token"], name: "index_oauth_access_tokens_on_token", unique: true
   end
 
-  create_table "oauth_applications", force: :cascade do |t|
-    t.string   "name",                         null: false
-    t.string   "uid",                          null: false
-    t.string   "secret",                       null: false
-    t.text     "redirect_uri",                 null: false
-    t.string   "scopes",       default: "",    null: false
+  create_table "oauth_applications", id: :serial, force: :cascade do |t|
+    t.string "name", null: false
+    t.string "uid", null: false
+    t.string "secret", null: false
+    t.text "redirect_uri", null: false
+    t.string "scopes", default: "", null: false
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.boolean  "superapp",     default: false, null: false
-    t.string   "website"
-    t.index ["uid"], name: "index_oauth_applications_on_uid", unique: true, using: :btree
+    t.boolean "superapp", default: false, null: false
+    t.string "website"
+    t.index ["uid"], name: "index_oauth_applications_on_uid", unique: true
   end
 
-  create_table "preview_cards", force: :cascade do |t|
-    t.bigint   "status_id"
-    t.string   "url",                default: "", null: false
-    t.string   "title"
-    t.string   "description"
-    t.string   "image_file_name"
-    t.string   "image_content_type"
-    t.integer  "image_file_size"
+  create_table "preview_cards", id: :serial, force: :cascade do |t|
+    t.bigint "status_id"
+    t.string "url", default: "", null: false
+    t.string "title"
+    t.string "description"
+    t.string "image_file_name"
+    t.string "image_content_type"
+    t.integer "image_file_size"
     t.datetime "image_updated_at"
-    t.datetime "created_at",                      null: false
-    t.datetime "updated_at",                      null: false
-    t.integer  "type",               default: 0,  null: false
-    t.text     "html",               default: "", null: false
-    t.string   "author_name",        default: "", null: false
-    t.string   "author_url",         default: "", null: false
-    t.string   "provider_name",      default: "", null: false
-    t.string   "provider_url",       default: "", null: false
-    t.integer  "width",              default: 0,  null: false
-    t.integer  "height",             default: 0,  null: false
-    t.index ["status_id"], name: "index_preview_cards_on_status_id", unique: true, using: :btree
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.integer "type", default: 0, null: false
+    t.text "html", default: "", null: false
+    t.string "author_name", default: "", null: false
+    t.string "author_url", default: "", null: false
+    t.string "provider_name", default: "", null: false
+    t.string "provider_url", default: "", null: false
+    t.integer "width", default: 0, null: false
+    t.integer "height", default: 0, null: false
+    t.index ["status_id"], name: "index_preview_cards_on_status_id", unique: true
   end
 
-  create_table "reports", force: :cascade do |t|
-    t.integer  "account_id",                                 null: false
-    t.integer  "target_account_id",                          null: false
-    t.bigint   "status_ids",                 default: [],    null: false, array: true
-    t.text     "comment",                    default: "",    null: false
-    t.boolean  "action_taken",               default: false, null: false
-    t.datetime "created_at",                                 null: false
-    t.datetime "updated_at",                                 null: false
-    t.integer  "action_taken_by_account_id"
-    t.index ["account_id"], name: "index_reports_on_account_id", using: :btree
-    t.index ["target_account_id"], name: "index_reports_on_target_account_id", using: :btree
+  create_table "reports", id: :serial, force: :cascade do |t|
+    t.integer "account_id", null: false
+    t.integer "target_account_id", null: false
+    t.bigint "status_ids", default: [], null: false, array: true
+    t.text "comment", default: "", null: false
+    t.boolean "action_taken", default: false, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.integer "action_taken_by_account_id"
+    t.index ["account_id"], name: "index_reports_on_account_id"
+    t.index ["target_account_id"], name: "index_reports_on_target_account_id"
   end
 
-  create_table "settings", force: :cascade do |t|
-    t.string   "var",        null: false
-    t.text     "value"
-    t.string   "thing_type"
-    t.integer  "thing_id"
+  create_table "settings", id: :serial, force: :cascade do |t|
+    t.string "var", null: false
+    t.text "value"
+    t.string "thing_type"
+    t.integer "thing_id"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.index ["thing_type", "thing_id", "var"], name: "index_settings_on_thing_type_and_thing_id_and_var", unique: true, using: :btree
+    t.index ["thing_type", "thing_id", "var"], name: "index_settings_on_thing_type_and_thing_id_and_var", unique: true
   end
 
-  create_table "statuses", id: :bigserial, force: :cascade do |t|
-    t.string   "uri"
-    t.integer  "account_id",                             null: false
-    t.text     "text",                   default: "",    null: false
-    t.datetime "created_at",                             null: false
-    t.datetime "updated_at",                             null: false
-    t.bigint   "in_reply_to_id"
-    t.bigint   "reblog_of_id"
-    t.string   "url"
-    t.boolean  "sensitive",              default: false
-    t.integer  "visibility",             default: 0,     null: false
-    t.integer  "in_reply_to_account_id"
-    t.integer  "application_id"
-    t.text     "spoiler_text",           default: "",    null: false
-    t.boolean  "reply",                  default: false
-    t.integer  "favourites_count",       default: 0,     null: false
-    t.integer  "reblogs_count",          default: 0,     null: false
-    t.string   "language",               default: "en",  null: false
-    t.bigint   "conversation_id"
-    t.index ["account_id"], name: "index_statuses_on_account_id", using: :btree
-    t.index ["conversation_id"], name: "index_statuses_on_conversation_id", using: :btree
-    t.index ["in_reply_to_id"], name: "index_statuses_on_in_reply_to_id", using: :btree
-    t.index ["reblog_of_id"], name: "index_statuses_on_reblog_of_id", using: :btree
-    t.index ["uri"], name: "index_statuses_on_uri", unique: true, using: :btree
+  create_table "statuses", force: :cascade do |t|
+    t.string "uri"
+    t.integer "account_id", null: false
+    t.text "text", default: "", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.bigint "in_reply_to_id"
+    t.bigint "reblog_of_id"
+    t.string "url"
+    t.boolean "sensitive", default: false
+    t.integer "visibility", default: 0, null: false
+    t.integer "in_reply_to_account_id"
+    t.integer "application_id"
+    t.text "spoiler_text", default: "", null: false
+    t.boolean "reply", default: false
+    t.integer "favourites_count", default: 0, null: false
+    t.integer "reblogs_count", default: 0, null: false
+    t.string "language", default: "en", null: false
+    t.bigint "conversation_id"
+    t.index ["account_id"], name: "index_statuses_on_account_id"
+    t.index ["conversation_id"], name: "index_statuses_on_conversation_id"
+    t.index ["in_reply_to_id"], name: "index_statuses_on_in_reply_to_id"
+    t.index ["reblog_of_id"], name: "index_statuses_on_reblog_of_id"
+    t.index ["uri"], name: "index_statuses_on_uri", unique: true
   end
 
   create_table "statuses_tags", id: false, force: :cascade do |t|
-    t.bigint  "status_id", null: false
-    t.integer "tag_id",    null: false
-    t.index ["status_id"], name: "index_statuses_tags_on_status_id", using: :btree
-    t.index ["tag_id", "status_id"], name: "index_statuses_tags_on_tag_id_and_status_id", unique: true, using: :btree
+    t.bigint "status_id", null: false
+    t.integer "tag_id", null: false
+    t.index ["status_id"], name: "index_statuses_tags_on_status_id"
+    t.index ["tag_id", "status_id"], name: "index_statuses_tags_on_tag_id_and_status_id", unique: true
   end
 
-  create_table "stream_entries", force: :cascade do |t|
-    t.integer  "account_id"
-    t.bigint   "activity_id"
-    t.string   "activity_type"
-    t.datetime "created_at",                    null: false
-    t.datetime "updated_at",                    null: false
-    t.boolean  "hidden",        default: false, null: false
-    t.index ["account_id"], name: "index_stream_entries_on_account_id", using: :btree
-    t.index ["activity_id", "activity_type"], name: "index_stream_entries_on_activity_id_and_activity_type", using: :btree
+  create_table "stream_entries", id: :serial, force: :cascade do |t|
+    t.integer "account_id"
+    t.bigint "activity_id"
+    t.string "activity_type"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.boolean "hidden", default: false, null: false
+    t.index ["account_id"], name: "index_stream_entries_on_account_id"
+    t.index ["activity_id", "activity_type"], name: "index_stream_entries_on_activity_id_and_activity_type"
   end
 
-  create_table "subscriptions", force: :cascade do |t|
-    t.string   "callback_url",                default: "",    null: false
-    t.string   "secret"
+  create_table "subscriptions", id: :serial, force: :cascade do |t|
+    t.string "callback_url", default: "", null: false
+    t.string "secret"
     t.datetime "expires_at"
-    t.boolean  "confirmed",                   default: false, null: false
-    t.integer  "account_id",                                  null: false
-    t.datetime "created_at",                                  null: false
-    t.datetime "updated_at",                                  null: false
+    t.boolean "confirmed", default: false, null: false
+    t.integer "account_id", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.datetime "last_successful_delivery_at"
-    t.index ["account_id", "callback_url"], name: "index_subscriptions_on_account_id_and_callback_url", unique: true, using: :btree
+    t.index ["account_id", "callback_url"], name: "index_subscriptions_on_account_id_and_callback_url", unique: true
   end
 
-  create_table "tags", force: :cascade do |t|
-    t.string   "name",       default: "", null: false
-    t.datetime "created_at",              null: false
-    t.datetime "updated_at",              null: false
+  create_table "tags", id: :serial, force: :cascade do |t|
+    t.string "name", default: "", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index "to_tsvector('simple'::regconfig, (name)::text)", name: "hashtag_search_index", using: :gin
-    t.index ["name"], name: "index_tags_on_name", unique: true, using: :btree
+    t.index ["name"], name: "index_tags_on_name", unique: true
   end
 
-  create_table "users", force: :cascade do |t|
-    t.string   "email",                     default: "",    null: false
-    t.integer  "account_id",                                null: false
-    t.datetime "created_at",                                null: false
-    t.datetime "updated_at",                                null: false
-    t.string   "encrypted_password",        default: "",    null: false
-    t.string   "reset_password_token"
+  create_table "users", id: :serial, force: :cascade do |t|
+    t.string "email", default: "", null: false
+    t.integer "account_id", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.string "encrypted_password", default: "", null: false
+    t.string "reset_password_token"
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",             default: 0,     null: false
+    t.integer "sign_in_count", default: 0, null: false
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
-    t.inet     "current_sign_in_ip"
-    t.inet     "last_sign_in_ip"
-    t.boolean  "admin",                     default: false
-    t.string   "confirmation_token"
+    t.inet "current_sign_in_ip"
+    t.inet "last_sign_in_ip"
+    t.boolean "admin", default: false
+    t.string "confirmation_token"
     t.datetime "confirmed_at"
     t.datetime "confirmation_sent_at"
-    t.string   "unconfirmed_email"
-    t.string   "locale"
-    t.string   "encrypted_otp_secret"
-    t.string   "encrypted_otp_secret_iv"
-    t.string   "encrypted_otp_secret_salt"
-    t.integer  "consumed_timestep"
-    t.boolean  "otp_required_for_login"
+    t.string "unconfirmed_email"
+    t.string "locale"
+    t.string "encrypted_otp_secret"
+    t.string "encrypted_otp_secret_iv"
+    t.string "encrypted_otp_secret_salt"
+    t.integer "consumed_timestep"
+    t.boolean "otp_required_for_login"
     t.datetime "last_emailed_at"
-    t.string   "otp_backup_codes",                                       array: true
-    t.string   "filtered_languages",        default: [],    null: false, array: true
-    t.index ["account_id"], name: "index_users_on_account_id", using: :btree
-    t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true, using: :btree
-    t.index ["email"], name: "index_users_on_email", unique: true, using: :btree
+    t.string "otp_backup_codes", array: true
+    t.string "filtered_languages", default: [], null: false, array: true
+    t.index ["account_id"], name: "index_users_on_account_id"
+    t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true
+    t.index ["email"], name: "index_users_on_email", unique: true
     t.index ["filtered_languages"], name: "index_users_on_filtered_languages", using: :gin
-    t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree
+    t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
   end
 
-  create_table "web_settings", force: :cascade do |t|
-    t.integer  "user_id"
-    t.json     "data"
+  create_table "web_settings", id: :serial, force: :cascade do |t|
+    t.integer "user_id"
+    t.json "data"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.index ["user_id"], name: "index_web_settings_on_user_id", unique: true, using: :btree
+    t.index ["user_id"], name: "index_web_settings_on_user_id", unique: true
   end
 
   add_foreign_key "statuses", "statuses", column: "reblog_of_id", on_delete: :cascade