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.
master
Daniel Hunsaker 7 years ago committed by Eugen Rochko
parent 252d0fe020
commit cf7e840990
  1. 2
      app/models/account.rb
  2. 4
      app/models/account_domain_block.rb
  3. 6
      app/models/account_moderation_note.rb
  4. 6
      app/models/block.rb
  5. 2
      app/models/conversation.rb
  6. 6
      app/models/conversation_mute.rb
  7. 2
      app/models/custom_emoji.rb
  8. 2
      app/models/domain_block.rb
  9. 2
      app/models/email_domain_block.rb
  10. 6
      app/models/favourite.rb
  11. 6
      app/models/follow.rb
  12. 6
      app/models/follow_request.rb
  13. 4
      app/models/import.rb
  14. 6
      app/models/media_attachment.rb
  15. 6
      app/models/mention.rb
  16. 6
      app/models/mute.rb
  17. 8
      app/models/notification.rb
  18. 2
      app/models/preview_card.rb
  19. 8
      app/models/report.rb
  20. 14
      app/models/session_activation.rb
  21. 4
      app/models/setting.rb
  22. 2
      app/models/site_upload.rb
  23. 14
      app/models/status.rb
  24. 6
      app/models/status_pin.rb
  25. 6
      app/models/stream_entry.rb
  26. 4
      app/models/subscription.rb
  27. 2
      app/models/tag.rb
  28. 4
      app/models/user.rb
  29. 2
      app/models/web/push_subscription.rb
  30. 4
      app/models/web/setting.rb

@ -3,7 +3,7 @@
#
# Table name: accounts
#
# id :integer not null, primary key
# id :bigint not null, primary key
# username :string default(""), not null
# domain :string
# secret :string default(""), not null

@ -6,8 +6,8 @@
# domain :string
# created_at :datetime not null
# updated_at :datetime not null
# account_id :integer
# id :integer not null, primary key
# account_id :bigint
# id :bigint not null, primary key
#
class AccountDomainBlock < ApplicationRecord

@ -3,10 +3,10 @@
#
# Table name: account_moderation_notes
#
# id :integer not null, primary key
# id :bigint not null, primary key
# content :text not null
# account_id :integer not null
# target_account_id :integer not null
# account_id :bigint not null
# target_account_id :bigint not null
# created_at :datetime not null
# updated_at :datetime not null
#

@ -5,9 +5,9 @@
#
# created_at :datetime not null
# updated_at :datetime not null
# account_id :integer not null
# id :integer not null, primary key
# target_account_id :integer not null
# account_id :bigint not null
# id :bigint not null, primary key
# target_account_id :bigint not null
#
class Block < ApplicationRecord

@ -3,7 +3,7 @@
#
# Table name: conversations
#
# id :integer not null, primary key
# id :bigint not null, primary key
# uri :string
# created_at :datetime not null
# updated_at :datetime not null

@ -3,9 +3,9 @@
#
# Table name: conversation_mutes
#
# conversation_id :integer not null
# account_id :integer not null
# id :integer not null, primary key
# conversation_id :bigint not null
# account_id :bigint not null
# id :bigint not null, primary key
#
class ConversationMute < ApplicationRecord

@ -3,7 +3,7 @@
#
# Table name: custom_emojis
#
# id :integer not null, primary key
# id :bigint not null, primary key
# shortcode :string default(""), not null
# domain :string
# image_file_name :string

@ -8,7 +8,7 @@
# updated_at :datetime not null
# severity :integer default("silence")
# reject_media :boolean default(FALSE), not null
# id :integer not null, primary key
# id :bigint not null, primary key
#
class DomainBlock < ApplicationRecord

@ -3,7 +3,7 @@
#
# Table name: email_domain_blocks
#
# id :integer not null, primary key
# id :bigint not null, primary key
# domain :string not null
# created_at :datetime not null
# updated_at :datetime not null

@ -5,9 +5,9 @@
#
# created_at :datetime not null
# updated_at :datetime not null
# account_id :integer not null
# id :integer not null, primary key
# status_id :integer not null
# account_id :bigint not null
# id :bigint not null, primary key
# status_id :bigint not null
#
class Favourite < ApplicationRecord

@ -5,9 +5,9 @@
#
# created_at :datetime not null
# updated_at :datetime not null
# account_id :integer not null
# id :integer not null, primary key
# target_account_id :integer not null
# account_id :bigint not null
# id :bigint not null, primary key
# target_account_id :bigint not null
#
class Follow < ApplicationRecord

@ -5,9 +5,9 @@
#
# created_at :datetime not null
# updated_at :datetime not null
# account_id :integer not null
# id :integer not null, primary key
# target_account_id :integer not null
# account_id :bigint not null
# id :bigint not null, primary key
# target_account_id :bigint not null
#
class FollowRequest < ApplicationRecord

@ -11,8 +11,8 @@
# data_content_type :string
# data_file_size :integer
# data_updated_at :datetime
# account_id :integer not null
# id :integer not null, primary key
# account_id :bigint not null
# id :bigint not null, primary key
#
class Import < ApplicationRecord

@ -3,14 +3,14 @@
#
# Table name: media_attachments
#
# id :integer not null, primary key
# status_id :integer
# id :bigint not null, primary key
# status_id :bigint
# file_file_name :string
# file_content_type :string
# file_file_size :integer
# file_updated_at :datetime
# remote_url :string default(""), not null
# account_id :integer
# account_id :bigint
# created_at :datetime not null
# updated_at :datetime not null
# shortcode :string

@ -3,11 +3,11 @@
#
# Table name: mentions
#
# status_id :integer
# status_id :bigint
# created_at :datetime not null
# updated_at :datetime not null
# account_id :integer
# id :integer not null, primary key
# account_id :bigint
# id :bigint not null, primary key
#
class Mention < ApplicationRecord

@ -5,9 +5,9 @@
#
# created_at :datetime not null
# updated_at :datetime not null
# account_id :integer not null
# id :integer not null, primary key
# target_account_id :integer not null
# account_id :bigint not null
# id :bigint not null, primary key
# target_account_id :bigint not null
#
class Mute < ApplicationRecord

@ -3,13 +3,13 @@
#
# Table name: notifications
#
# id :integer not null, primary key
# account_id :integer
# activity_id :integer
# id :bigint not null, primary key
# account_id :bigint
# activity_id :bigint
# activity_type :string
# created_at :datetime not null
# updated_at :datetime not null
# from_account_id :integer
# from_account_id :bigint
#
class Notification < ApplicationRecord

@ -3,7 +3,7 @@
#
# Table name: preview_cards
#
# id :integer not null, primary key
# id :bigint not null, primary key
# url :string default(""), not null
# title :string default(""), not null
# description :string default(""), not null

@ -8,10 +8,10 @@
# action_taken :boolean default(FALSE), not null
# created_at :datetime not null
# updated_at :datetime not null
# account_id :integer not null
# action_taken_by_account_id :integer
# id :integer not null, primary key
# target_account_id :integer not null
# account_id :bigint not null
# action_taken_by_account_id :bigint
# id :bigint not null, primary key
# target_account_id :bigint not null
#
class Report < ApplicationRecord

@ -3,25 +3,25 @@
#
# Table name: session_activations
#
# id :integer not null, primary key
# user_id :integer not null
# id :bigint not null, primary key
# user_id :bigint not null
# session_id :string not null
# created_at :datetime not null
# updated_at :datetime not null
# user_agent :string default(""), not null
# ip :inet
# access_token_id :integer
# web_push_subscription_id :integer
# access_token_id :bigint
# web_push_subscription_id :bigint
#
# id :integer not null, primary key
# user_id :integer not null
# id :bigint not null, primary key
# user_id :bigint not null
# session_id :string not null
# created_at :datetime not null
# updated_at :datetime not null
# user_agent :string default(""), not null
# ip :inet
# access_token_id :integer
# access_token_id :bigint
#
class SessionActivation < ApplicationRecord

@ -8,8 +8,8 @@
# thing_type :string
# created_at :datetime
# updated_at :datetime
# id :integer not null, primary key
# thing_id :integer
# id :bigint not null, primary key
# thing_id :bigint
#
class Setting < RailsSettings::Base

@ -3,7 +3,7 @@
#
# Table name: site_uploads
#
# id :integer not null, primary key
# id :bigint not null, primary key
# var :string default(""), not null
# file_file_name :string
# file_content_type :string

@ -3,25 +3,25 @@
#
# Table name: statuses
#
# id :integer not null, primary key
# id :bigint not null, primary key
# uri :string
# account_id :integer not null
# account_id :bigint not null
# text :text default(""), not null
# created_at :datetime not null
# updated_at :datetime not null
# in_reply_to_id :integer
# reblog_of_id :integer
# in_reply_to_id :bigint
# reblog_of_id :bigint
# url :string
# sensitive :boolean default(FALSE), not null
# visibility :integer default("public"), not null
# in_reply_to_account_id :integer
# application_id :integer
# in_reply_to_account_id :bigint
# application_id :bigint
# spoiler_text :text default(""), not null
# reply :boolean default(FALSE), not null
# favourites_count :integer default(0), not null
# reblogs_count :integer default(0), not null
# language :string
# conversation_id :integer
# conversation_id :bigint
# local :boolean
#

@ -3,9 +3,9 @@
#
# Table name: status_pins
#
# id :integer not null, primary key
# account_id :integer not null
# status_id :integer not null
# id :bigint not null, primary key
# account_id :bigint not null
# status_id :bigint not null
# created_at :datetime not null
# updated_at :datetime not null
#

@ -3,13 +3,13 @@
#
# Table name: stream_entries
#
# activity_id :integer
# activity_id :bigint
# activity_type :string
# created_at :datetime not null
# updated_at :datetime not null
# hidden :boolean default(FALSE), not null
# account_id :integer
# id :integer not null, primary key
# account_id :bigint
# id :bigint not null, primary key
#
class StreamEntry < ApplicationRecord

@ -11,8 +11,8 @@
# updated_at :datetime not null
# last_successful_delivery_at :datetime
# domain :string
# account_id :integer not null
# id :integer not null, primary key
# account_id :bigint not null
# id :bigint not null, primary key
#
class Subscription < ApplicationRecord

@ -3,7 +3,7 @@
#
# Table name: tags
#
# id :integer not null, primary key
# id :bigint not null, primary key
# name :string default(""), not null
# created_at :datetime not null
# updated_at :datetime not null

@ -3,7 +3,7 @@
#
# Table name: users
#
# id :integer not null, primary key
# id :bigint not null, primary key
# email :string default(""), not null
# created_at :datetime not null
# updated_at :datetime not null
@ -30,7 +30,7 @@
# last_emailed_at :datetime
# otp_backup_codes :string 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
# moderator :boolean default(FALSE), not null
#

@ -3,7 +3,7 @@
#
# Table name: web_push_subscriptions
#
# id :integer not null, primary key
# id :bigint not null, primary key
# endpoint :string not null
# key_p256dh :string not null
# key_auth :string not null

@ -6,8 +6,8 @@
# data :json
# created_at :datetime not null
# updated_at :datetime not null
# id :integer not null, primary key
# user_id :integer
# id :bigint not null, primary key
# user_id :bigint
#
class Web::Setting < ApplicationRecord

Loading…
Cancel
Save