Commit cf7e8409 authored by Dan Hunsaker's avatar Dan Hunsaker Committed by Eugen Rochko

Update model annotations to use BIGINT for IDs (#5461)

All the migrations have been updated to use BIGINTs for ID fields in the DB, but ActiveRecord needs to be told to treat those values as BIGINT as well. This PR does that.
parent 252d0fe0
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# #
# Table name: accounts # Table name: accounts
# #
# id :integer not null, primary key # id :bigint not null, primary key
# username :string default(""), not null # username :string default(""), not null
# domain :string # domain :string
# secret :string default(""), not null # secret :string default(""), not null
......
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
# domain :string # domain :string
# created_at :datetime not null # created_at :datetime not null
# updated_at :datetime not null # updated_at :datetime not null
# account_id :integer # account_id :bigint
# id :integer not null, primary key # id :bigint not null, primary key
# #
class AccountDomainBlock < ApplicationRecord class AccountDomainBlock < ApplicationRecord
......
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
# #
# Table name: account_moderation_notes # Table name: account_moderation_notes
# #
# id :integer not null, primary key # id :bigint not null, primary key
# content :text not null # content :text not null
# account_id :integer not null # account_id :bigint not null
# target_account_id :integer not null # target_account_id :bigint not null
# created_at :datetime not null # created_at :datetime not null
# updated_at :datetime not null # updated_at :datetime not null
# #
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
# #
# created_at :datetime not null # created_at :datetime not null
# updated_at :datetime not null # updated_at :datetime not null
# account_id :integer not null # account_id :bigint not null
# id :integer not null, primary key # id :bigint not null, primary key
# target_account_id :integer not null # target_account_id :bigint not null
# #
class Block < ApplicationRecord class Block < ApplicationRecord
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# #
# Table name: conversations # Table name: conversations
# #
# id :integer not null, primary key # id :bigint not null, primary key
# uri :string # uri :string
# created_at :datetime not null # created_at :datetime not null
# updated_at :datetime not null # updated_at :datetime not null
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
# #
# Table name: conversation_mutes # Table name: conversation_mutes
# #
# conversation_id :integer not null # conversation_id :bigint not null
# account_id :integer not null # account_id :bigint not null
# id :integer not null, primary key # id :bigint not null, primary key
# #
class ConversationMute < ApplicationRecord class ConversationMute < ApplicationRecord
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# #
# Table name: custom_emojis # Table name: custom_emojis
# #
# id :integer not null, primary key # id :bigint not null, primary key
# shortcode :string default(""), not null # shortcode :string default(""), not null
# domain :string # domain :string
# image_file_name :string # image_file_name :string
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
# updated_at :datetime not null # updated_at :datetime not null
# severity :integer default("silence") # severity :integer default("silence")
# reject_media :boolean default(FALSE), not null # reject_media :boolean default(FALSE), not null
# id :integer not null, primary key # id :bigint not null, primary key
# #
class DomainBlock < ApplicationRecord class DomainBlock < ApplicationRecord
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# #
# Table name: email_domain_blocks # Table name: email_domain_blocks
# #
# id :integer not null, primary key # id :bigint not null, primary key
# domain :string not null # domain :string not null
# created_at :datetime not null # created_at :datetime not null
# updated_at :datetime not null # updated_at :datetime not null
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
# #
# created_at :datetime not null # created_at :datetime not null
# updated_at :datetime not null # updated_at :datetime not null
# account_id :integer not null # account_id :bigint not null
# id :integer not null, primary key # id :bigint not null, primary key
# status_id :integer not null # status_id :bigint not null
# #
class Favourite < ApplicationRecord class Favourite < ApplicationRecord
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
# #
# created_at :datetime not null # created_at :datetime not null
# updated_at :datetime not null # updated_at :datetime not null
# account_id :integer not null # account_id :bigint not null
# id :integer not null, primary key # id :bigint not null, primary key
# target_account_id :integer not null # target_account_id :bigint not null
# #
class Follow < ApplicationRecord class Follow < ApplicationRecord
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
# #
# created_at :datetime not null # created_at :datetime not null
# updated_at :datetime not null # updated_at :datetime not null
# account_id :integer not null # account_id :bigint not null
# id :integer not null, primary key # id :bigint not null, primary key
# target_account_id :integer not null # target_account_id :bigint not null
# #
class FollowRequest < ApplicationRecord class FollowRequest < ApplicationRecord
......
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
# data_content_type :string # data_content_type :string
# data_file_size :integer # data_file_size :integer
# data_updated_at :datetime # data_updated_at :datetime
# account_id :integer not null # account_id :bigint not null
# id :integer not null, primary key # id :bigint not null, primary key
# #
class Import < ApplicationRecord class Import < ApplicationRecord
......
...@@ -3,14 +3,14 @@ ...@@ -3,14 +3,14 @@
# #
# Table name: media_attachments # Table name: media_attachments
# #
# id :integer not null, primary key # id :bigint not null, primary key
# status_id :integer # status_id :bigint
# file_file_name :string # file_file_name :string
# file_content_type :string # file_content_type :string
# file_file_size :integer # file_file_size :integer
# file_updated_at :datetime # file_updated_at :datetime
# remote_url :string default(""), not null # remote_url :string default(""), not null
# account_id :integer # account_id :bigint
# created_at :datetime not null # created_at :datetime not null
# updated_at :datetime not null # updated_at :datetime not null
# shortcode :string # shortcode :string
......
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
# #
# Table name: mentions # Table name: mentions
# #
# status_id :integer # status_id :bigint
# created_at :datetime not null # created_at :datetime not null
# updated_at :datetime not null # updated_at :datetime not null
# account_id :integer # account_id :bigint
# id :integer not null, primary key # id :bigint not null, primary key
# #
class Mention < ApplicationRecord class Mention < ApplicationRecord
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
# #
# created_at :datetime not null # created_at :datetime not null
# updated_at :datetime not null # updated_at :datetime not null
# account_id :integer not null # account_id :bigint not null
# id :integer not null, primary key # id :bigint not null, primary key
# target_account_id :integer not null # target_account_id :bigint not null
# #
class Mute < ApplicationRecord class Mute < ApplicationRecord
......
...@@ -3,13 +3,13 @@ ...@@ -3,13 +3,13 @@
# #
# Table name: notifications # Table name: notifications
# #
# id :integer not null, primary key # id :bigint not null, primary key
# account_id :integer # account_id :bigint
# activity_id :integer # activity_id :bigint
# activity_type :string # activity_type :string
# created_at :datetime not null # created_at :datetime not null
# updated_at :datetime not null # updated_at :datetime not null
# from_account_id :integer # from_account_id :bigint
# #
class Notification < ApplicationRecord class Notification < ApplicationRecord
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# #
# Table name: preview_cards # Table name: preview_cards
# #
# id :integer not null, primary key # id :bigint not null, primary key
# url :string default(""), not null # url :string default(""), not null
# title :string default(""), not null # title :string default(""), not null
# description :string default(""), not null # description :string default(""), not null
......
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
# action_taken :boolean default(FALSE), not null # action_taken :boolean default(FALSE), not null
# created_at :datetime not null # created_at :datetime not null
# updated_at :datetime not null # updated_at :datetime not null
# account_id :integer not null # account_id :bigint not null
# action_taken_by_account_id :integer # action_taken_by_account_id :bigint
# id :integer not null, primary key # id :bigint not null, primary key
# target_account_id :integer not null # target_account_id :bigint not null
# #
class Report < ApplicationRecord class Report < ApplicationRecord
......
...@@ -3,25 +3,25 @@ ...@@ -3,25 +3,25 @@
# #
# Table name: session_activations # Table name: session_activations
# #
# id :integer not null, primary key # id :bigint not null, primary key
# user_id :integer not null # user_id :bigint not null
# session_id :string not null # session_id :string not null
# created_at :datetime not null # created_at :datetime not null
# updated_at :datetime not null # updated_at :datetime not null
# user_agent :string default(""), not null # user_agent :string default(""), not null
# ip :inet # ip :inet
# access_token_id :integer # access_token_id :bigint
# web_push_subscription_id :integer # web_push_subscription_id :bigint
# #
# id :integer not null, primary key # id :bigint not null, primary key
# user_id :integer not null # user_id :bigint not null
# session_id :string not null # session_id :string not null
# created_at :datetime not null # created_at :datetime not null
# updated_at :datetime not null # updated_at :datetime not null
# user_agent :string default(""), not null # user_agent :string default(""), not null
# ip :inet # ip :inet
# access_token_id :integer # access_token_id :bigint
# #
class SessionActivation < ApplicationRecord class SessionActivation < ApplicationRecord
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
# thing_type :string # thing_type :string
# created_at :datetime # created_at :datetime
# updated_at :datetime # updated_at :datetime
# id :integer not null, primary key # id :bigint not null, primary key
# thing_id :integer # thing_id :bigint
# #
class Setting < RailsSettings::Base class Setting < RailsSettings::Base
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# #
# Table name: site_uploads # Table name: site_uploads
# #
# id :integer not null, primary key # id :bigint not null, primary key
# var :string default(""), not null # var :string default(""), not null
# file_file_name :string # file_file_name :string
# file_content_type :string # file_content_type :string
......
...@@ -3,25 +3,25 @@ ...@@ -3,25 +3,25 @@
# #
# Table name: statuses # Table name: statuses
# #
# id :integer not null, primary key # id :bigint not null, primary key
# uri :string # uri :string
# account_id :integer not null # account_id :bigint not null
# text :text default(""), not null # text :text default(""), not null
# created_at :datetime not null # created_at :datetime not null
# updated_at :datetime not null # updated_at :datetime not null
# in_reply_to_id :integer # in_reply_to_id :bigint
# reblog_of_id :integer # reblog_of_id :bigint
# url :string # url :string
# sensitive :boolean default(FALSE), not null # sensitive :boolean default(FALSE), not null
# visibility :integer default("public"), not null # visibility :integer default("public"), not null
# in_reply_to_account_id :integer # in_reply_to_account_id :bigint
# application_id :integer # application_id :bigint
# spoiler_text :text default(""), not null # spoiler_text :text default(""), not null
# reply :boolean default(FALSE), not null # reply :boolean default(FALSE), not null
# favourites_count :integer default(0), not null # favourites_count :integer default(0), not null
# reblogs_count :integer default(0), not null # reblogs_count :integer default(0), not null
# language :string # language :string
# conversation_id :integer # conversation_id :bigint
# local :boolean # local :boolean
# #
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
# #
# Table name: status_pins # Table name: status_pins
# #
# id :integer not null, primary key # id :bigint not null, primary key
# account_id :integer not null # account_id :bigint not null
# status_id :integer not null # status_id :bigint not null
# created_at :datetime not null # created_at :datetime not null
# updated_at :datetime not null # updated_at :datetime not null
# #
......
...@@ -3,13 +3,13 @@ ...@@ -3,13 +3,13 @@
# #
# Table name: stream_entries # Table name: stream_entries
# #
# activity_id :integer # activity_id :bigint
# activity_type :string # activity_type :string
# created_at :datetime not null # created_at :datetime not null
# updated_at :datetime not null # updated_at :datetime not null
# hidden :boolean default(FALSE), not null # hidden :boolean default(FALSE), not null
# account_id :integer # account_id :bigint
# id :integer not null, primary key # id :bigint not null, primary key
# #
class StreamEntry < ApplicationRecord class StreamEntry < ApplicationRecord
......
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
# updated_at :datetime not null # updated_at :datetime not null
# last_successful_delivery_at :datetime # last_successful_delivery_at :datetime
# domain :string # domain :string
# account_id :integer not null # account_id :bigint not null
# id :integer not null, primary key # id :bigint not null, primary key
# #
class Subscription < ApplicationRecord class Subscription < ApplicationRecord
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# #
# Table name: tags # Table name: tags
# #
# id :integer not null, primary key # id :bigint not null, primary key
# name :string default(""), not null # name :string default(""), not null
# created_at :datetime not null # created_at :datetime not null
# updated_at :datetime not null # updated_at :datetime not null
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# #
# Table name: users # Table name: users
# #
# id :integer not null, primary key # id :bigint not null, primary key
# email :string default(""), not null # email :string default(""), not null
# created_at :datetime not null # created_at :datetime not null
# updated_at :datetime not null # updated_at :datetime not null
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
# last_emailed_at :datetime # last_emailed_at :datetime
# otp_backup_codes :string is an Array # otp_backup_codes :string is an Array
# filtered_languages :string default([]), not null, is an Array # filtered_languages :string default([]), not null, is an Array
# account_id :integer not null # account_id :bigint not null
# disabled :boolean default(FALSE), not null # disabled :boolean default(FALSE), not null
# moderator :boolean default(FALSE), not null # moderator :boolean default(FALSE), not null
# #
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# #
# Table name: web_push_subscriptions # Table name: web_push_subscriptions
# #
# id :integer not null, primary key # id :bigint not null, primary key
# endpoint :string not null # endpoint :string not null
# key_p256dh :string not null # key_p256dh :string not null
# key_auth :string not null # key_auth :string not null
......
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
# data :json # data :json
# created_at :datetime not null # created_at :datetime not null
# updated_at :datetime not null # updated_at :datetime not null
# id :integer not null, primary key # id :bigint not null, primary key
# user_id :integer # user_id :bigint
# #
class Web::Setting < ApplicationRecord class Web::Setting < ApplicationRecord
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment