diff --git a/app/models/account.rb b/app/models/account.rb index 8a234a95f..291d3e571 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -3,6 +3,7 @@ # # Table name: accounts # +# id :bigint(8) not null, primary key # username :string default(""), not null # domain :string # private_key :text @@ -15,11 +16,11 @@ # url :string # avatar_file_name :string # avatar_content_type :string -# avatar_file_size :bigint(8) +# avatar_file_size :integer # avatar_updated_at :datetime # header_file_name :string # header_content_type :string -# header_file_size :bigint(8) +# header_file_size :integer # header_updated_at :datetime # avatar_remote_url :string # locked :boolean default(FALSE), not null @@ -30,7 +31,6 @@ # shared_inbox_url :string default(""), not null # followers_url :string default(""), not null # protocol :integer default("ostatus"), not null -# id :bigint(8) not null, primary key # memorial :boolean default(FALSE), not null # moved_to_account_id :bigint(8) # featured_collection_url :string diff --git a/app/models/account_statuses_cleanup_policy.rb b/app/models/account_statuses_cleanup_policy.rb index 0a9551ec2..0f78c1a54 100644 --- a/app/models/account_statuses_cleanup_policy.rb +++ b/app/models/account_statuses_cleanup_policy.rb @@ -4,8 +4,8 @@ # # Table name: account_statuses_cleanup_policies # -# id :bigint not null, primary key -# account_id :bigint not null +# id :bigint(8) not null, primary key +# account_id :bigint(8) not null # enabled :boolean default(TRUE), not null # min_status_age :integer default(1209600), not null # keep_direct :boolean default(TRUE), not null diff --git a/app/models/custom_emoji.rb b/app/models/custom_emoji.rb index bafbcbb8e..a85feb73a 100644 --- a/app/models/custom_emoji.rb +++ b/app/models/custom_emoji.rb @@ -8,7 +8,7 @@ # domain :string # image_file_name :string # image_content_type :string -# image_file_size :bigint(8) +# image_file_size :integer # image_updated_at :datetime # created_at :datetime not null # updated_at :datetime not null diff --git a/app/models/import.rb b/app/models/import.rb index 1d8617b88..00a54892e 100644 --- a/app/models/import.rb +++ b/app/models/import.rb @@ -3,16 +3,16 @@ # # Table name: imports # +# id :bigint(8) not null, primary key # type :integer not null # approved :boolean default(FALSE), not null # created_at :datetime not null # updated_at :datetime not null # data_file_name :string # data_content_type :string -# data_file_size :bigint(8) +# data_file_size :integer # data_updated_at :datetime # account_id :bigint(8) not null -# id :bigint(8) not null, primary key # overwrite :boolean default(FALSE), not null # diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb index ae74fc83b..1741d20e9 100644 --- a/app/models/media_attachment.rb +++ b/app/models/media_attachment.rb @@ -3,10 +3,11 @@ # # Table name: media_attachments # +# id :bigint(8) not null, primary key # status_id :bigint(8) # file_file_name :string # file_content_type :string -# file_file_size :bigint(8) +# file_file_size :integer # file_updated_at :datetime # remote_url :string default(""), not null # created_at :datetime not null @@ -15,7 +16,6 @@ # type :integer default("image"), not null # file_meta :json # account_id :bigint(8) -# id :bigint(8) not null, primary key # description :text # scheduled_status_id :bigint(8) # blurhash :string diff --git a/app/models/preview_card.rb b/app/models/preview_card.rb index e43d7d9a8..bca3a3ce8 100644 --- a/app/models/preview_card.rb +++ b/app/models/preview_card.rb @@ -9,7 +9,7 @@ # description :string default(""), not null # image_file_name :string # image_content_type :string -# image_file_size :bigint(8) +# image_file_size :integer # image_updated_at :datetime # type :integer default("link"), not null # html :text default(""), not null diff --git a/app/models/site_upload.rb b/app/models/site_upload.rb index 108115e3e..cf10b30fc 100644 --- a/app/models/site_upload.rb +++ b/app/models/site_upload.rb @@ -7,7 +7,7 @@ # var :string default(""), not null # file_file_name :string # file_content_type :string -# file_file_size :bigint(8) +# file_file_size :integer # file_updated_at :datetime # meta :json # created_at :datetime not null diff --git a/db/schema.rb b/db/schema.rb index 621647033..2bc0dbf72 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -162,11 +162,11 @@ ActiveRecord::Schema.define(version: 2021_08_08_071221) do t.string "url" t.string "avatar_file_name" t.string "avatar_content_type" - t.bigint "avatar_file_size" + t.integer "avatar_file_size" t.datetime "avatar_updated_at" t.string "header_file_name" t.string "header_content_type" - t.bigint "header_file_size" + t.integer "header_file_size" t.datetime "header_updated_at" t.string "avatar_remote_url" t.boolean "locked", default: false, null: false @@ -191,8 +191,8 @@ ActiveRecord::Schema.define(version: 2021_08_08_071221) do t.integer "avatar_storage_schema_version" t.integer "header_storage_schema_version" t.string "devices_url" - t.datetime "sensitized_at" t.integer "suspension_origin" + t.datetime "sensitized_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), COALESCE(lower((domain)::text), ''::text)", name: "index_accounts_on_username_and_domain_lower", unique: true t.index ["moved_to_account_id"], name: "index_accounts_on_moved_to_account_id" @@ -324,7 +324,7 @@ ActiveRecord::Schema.define(version: 2021_08_08_071221) do t.string "domain" t.string "image_file_name" t.string "image_content_type" - t.bigint "image_file_size" + t.integer "image_file_size" t.datetime "image_updated_at" t.datetime "created_at", null: false t.datetime "updated_at", null: false @@ -471,7 +471,7 @@ ActiveRecord::Schema.define(version: 2021_08_08_071221) do t.datetime "updated_at", null: false t.string "data_file_name" t.string "data_content_type" - t.bigint "data_file_size" + t.integer "data_file_size" t.datetime "data_updated_at" t.bigint "account_id", null: false t.boolean "overwrite", default: false, null: false @@ -492,12 +492,12 @@ ActiveRecord::Schema.define(version: 2021_08_08_071221) do end create_table "ip_blocks", force: :cascade do |t| - t.inet "ip", default: "0.0.0.0", null: false - t.integer "severity", default: 0, null: false - t.datetime "expires_at" - t.text "comment", default: "", null: false t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.datetime "expires_at" + t.inet "ip", default: "0.0.0.0", null: false + t.integer "severity", default: 0, null: false + t.text "comment", default: "", null: false end create_table "list_accounts", force: :cascade do |t| @@ -544,7 +544,7 @@ ActiveRecord::Schema.define(version: 2021_08_08_071221) do t.bigint "status_id" t.string "file_file_name" t.string "file_content_type" - t.bigint "file_file_size" + t.integer "file_file_size" t.datetime "file_updated_at" t.string "remote_url", default: "", null: false t.datetime "created_at", null: false @@ -702,7 +702,7 @@ ActiveRecord::Schema.define(version: 2021_08_08_071221) do t.string "description", default: "", null: false t.string "image_file_name" t.string "image_content_type" - t.bigint "image_file_size" + t.integer "image_file_size" t.datetime "image_updated_at" t.integer "type", default: 0, null: false t.text "html", default: "", null: false @@ -804,7 +804,7 @@ ActiveRecord::Schema.define(version: 2021_08_08_071221) do t.string "var", default: "", null: false t.string "file_file_name" t.string "file_content_type" - t.bigint "file_file_size" + t.integer "file_file_size" t.datetime "file_updated_at" t.json "meta" t.datetime "created_at", null: false @@ -815,8 +815,8 @@ ActiveRecord::Schema.define(version: 2021_08_08_071221) do create_table "status_pins", force: :cascade do |t| t.bigint "account_id", null: false t.bigint "status_id", null: false - t.datetime "created_at", default: -> { "CURRENT_TIMESTAMP" }, null: false - t.datetime "updated_at", default: -> { "CURRENT_TIMESTAMP" }, null: false + t.datetime "created_at", default: -> { "now()" }, null: false + t.datetime "updated_at", default: -> { "now()" }, null: false t.index ["account_id", "status_id"], name: "index_status_pins_on_account_id_and_status_id", unique: true end