From a3839495e0cadacec3b39c36e9f57490808f4e54 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 11 Jan 2019 12:19:23 -0500 Subject: [PATCH] Update annotations --- app/models/badge.rb | 7 +++---- app/models/badge_grouping.rb | 2 +- app/models/badge_type.rb | 2 +- app/models/category.rb | 14 +++++++------- app/models/category_tag.rb | 4 ++-- app/models/category_tag_group.rb | 4 ++-- app/models/child_theme.rb | 4 ++-- app/models/color_scheme.rb | 2 +- app/models/color_scheme_color.rb | 4 ++-- app/models/draft.rb | 2 +- app/models/draft_sequence.rb | 2 +- app/models/email_log.rb | 4 ++-- app/models/email_token.rb | 4 ++-- app/models/embeddable_host.rb | 6 +++--- app/models/github_user_info.rb | 2 +- app/models/google_user_info.rb | 18 +++++++++--------- app/models/group.rb | 4 ++-- app/models/group_archived_message.rb | 4 ++-- app/models/group_mention.rb | 4 ++-- app/models/invite.rb | 2 +- app/models/muted_user.rb | 4 ++-- app/models/oauth2_user_info.rb | 8 ++++---- app/models/optimized_image.rb | 5 ++++- app/models/permalink.rb | 4 ++-- app/models/plugin_store_row.rb | 6 +++--- app/models/post.rb | 4 ++-- app/models/post_detail.rb | 4 ++-- app/models/post_search_data.rb | 2 +- app/models/post_stat.rb | 4 ++-- app/models/queued_post.rb | 6 +++--- app/models/remote_theme.rb | 6 +++--- app/models/screened_email.rb | 6 +++--- app/models/screened_url.rb | 4 ++-- app/models/single_sign_on_record.rb | 8 ++++---- app/models/site_setting.rb | 2 +- app/models/stylesheet_cache.rb | 8 ++++---- app/models/tag.rb | 4 ++-- app/models/tag_group.rb | 4 ++-- app/models/tag_group_membership.rb | 4 ++-- app/models/tag_user.rb | 4 ++-- app/models/theme.rb | 2 +- app/models/theme_field.rb | 4 ++-- app/models/topic.rb | 12 ++++++------ app/models/topic_link.rb | 12 ++++++------ app/models/topic_link_click.rb | 2 +- app/models/topic_search_data.rb | 2 +- app/models/topic_tag.rb | 4 ++-- app/models/topic_timer.rb | 4 ++-- app/models/topic_user.rb | 4 ++-- app/models/unsubscribe_key.rb | 4 ++-- app/models/upload.rb | 6 +++--- app/models/user.rb | 6 +++--- app/models/user_action.rb | 10 +++++----- app/models/user_api_key.rb | 4 ++-- app/models/user_archived_message.rb | 4 ++-- app/models/user_auth_token.rb | 4 ++-- app/models/user_badge.rb | 1 - app/models/user_email.rb | 4 ++-- app/models/user_export.rb | 6 +++--- app/models/user_field.rb | 10 +++++----- app/models/user_field_option.rb | 6 +++--- app/models/user_history.rb | 19 ++++++++++--------- app/models/user_open_id.rb | 4 ++-- app/models/user_profile.rb | 6 +++--- app/models/user_warning.rb | 4 ++-- app/models/watched_word.rb | 4 ++-- app/models/web_hook.rb | 4 ++-- app/models/web_hook_event.rb | 4 ++-- 68 files changed, 175 insertions(+), 173 deletions(-) diff --git a/app/models/badge.rb b/app/models/badge.rb index 117f27c5836..3f559a94a3a 100644 --- a/app/models/badge.rb +++ b/app/models/badge.rb @@ -252,7 +252,7 @@ end # Table name: badges # # id :integer not null, primary key -# name :string not null +# name :string(255) not null # description :text # badge_type_id :integer not null # grant_count :integer default(0), not null @@ -260,7 +260,7 @@ end # updated_at :datetime not null # allow_title :boolean default(FALSE), not null # multiple_grant :boolean default(FALSE), not null -# icon :string default("fa-certificate") +# icon :string(255) default("fa-certificate") # listable :boolean default(TRUE) # target_posts :boolean default(FALSE) # query :text @@ -275,6 +275,5 @@ end # # Indexes # -# index_badges_on_badge_type_id (badge_type_id) -# index_badges_on_name (name) UNIQUE +# index_badges_on_name (name) UNIQUE # diff --git a/app/models/badge_grouping.rb b/app/models/badge_grouping.rb index 4fdcef66e3a..f1201e72140 100644 --- a/app/models/badge_grouping.rb +++ b/app/models/badge_grouping.rb @@ -22,7 +22,7 @@ end # Table name: badge_groupings # # id :integer not null, primary key -# name :string not null +# name :string(255) not null # description :text # position :integer not null # created_at :datetime not null diff --git a/app/models/badge_type.rb b/app/models/badge_type.rb index b1d6e91edd9..4648e3ad58e 100644 --- a/app/models/badge_type.rb +++ b/app/models/badge_type.rb @@ -12,7 +12,7 @@ end # Table name: badge_types # # id :integer not null, primary key -# name :string not null +# name :string(255) not null # created_at :datetime not null # updated_at :datetime not null # diff --git a/app/models/category.rb b/app/models/category.rb index 955fce74765..117ea2f40d2 100644 --- a/app/models/category.rb +++ b/app/models/category.rb @@ -634,7 +634,7 @@ end # # id :integer not null, primary key # name :string(50) not null -# color :string(6) default("0088CC"), not null +# color :string(6) default("AB9364"), not null # topic_id :integer # topic_count :integer default(0), not null # created_at :datetime not null @@ -643,7 +643,7 @@ end # topics_year :integer default(0) # topics_month :integer default(0) # topics_week :integer default(0) -# slug :string not null +# slug :string(255) not null # description :text # text_color :string(6) default("FFFFFF"), not null # read_restricted :boolean default(FALSE), not null @@ -656,7 +656,7 @@ end # posts_year :integer default(0) # posts_month :integer default(0) # posts_week :integer default(0) -# email_in :string +# email_in :string(255) # email_in_allow_strangers :boolean default(FALSE) # topics_day :integer default(0) # posts_day :integer default(0) @@ -678,12 +678,12 @@ end # default_top_period :string(20) default("all") # mailinglist_mirror :boolean default(FALSE), not null # suppress_from_latest :boolean default(FALSE) -# minimum_required_tags :integer default(0) +# minimum_required_tags :integer default(0), not null # navigate_to_first_post_after_read :boolean default(FALSE), not null # # Indexes # -# index_categories_on_email_in (email_in) UNIQUE -# index_categories_on_topic_count (topic_count) -# unique_index_categories_on_name (COALESCE(parent_category_id, '-1'::integer), name) UNIQUE +# index_categories_on_email_in (email_in) UNIQUE +# index_categories_on_forum_thread_count (topic_count) +# unique_index_categories_on_name (COALESCE(parent_category_id, '-1'::integer), name) UNIQUE # diff --git a/app/models/category_tag.rb b/app/models/category_tag.rb index 507d13e3845..20ab52d7bc2 100644 --- a/app/models/category_tag.rb +++ b/app/models/category_tag.rb @@ -10,8 +10,8 @@ end # id :integer not null, primary key # category_id :integer not null # tag_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # # Indexes # diff --git a/app/models/category_tag_group.rb b/app/models/category_tag_group.rb index c262539b961..3c642d39649 100644 --- a/app/models/category_tag_group.rb +++ b/app/models/category_tag_group.rb @@ -10,8 +10,8 @@ end # id :integer not null, primary key # category_id :integer not null # tag_group_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # # Indexes # diff --git a/app/models/child_theme.rb b/app/models/child_theme.rb index c281f87f061..f0d7e112aab 100644 --- a/app/models/child_theme.rb +++ b/app/models/child_theme.rb @@ -23,8 +23,8 @@ end # id :integer not null, primary key # parent_theme_id :integer # child_theme_id :integer -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # # Indexes # diff --git a/app/models/color_scheme.rb b/app/models/color_scheme.rb index 526b2a0aaf7..07b9132ecdc 100644 --- a/app/models/color_scheme.rb +++ b/app/models/color_scheme.rb @@ -280,7 +280,7 @@ end # Table name: color_schemes # # id :integer not null, primary key -# name :string not null +# name :string(255) not null # version :integer default(1), not null # created_at :datetime not null # updated_at :datetime not null diff --git a/app/models/color_scheme_color.rb b/app/models/color_scheme_color.rb index 51e0c4ae8d0..39a7b51eec6 100644 --- a/app/models/color_scheme_color.rb +++ b/app/models/color_scheme_color.rb @@ -9,8 +9,8 @@ end # Table name: color_scheme_colors # # id :integer not null, primary key -# name :string not null -# hex :string not null +# name :string(255) not null +# hex :string(255) not null # color_scheme_id :integer not null # created_at :datetime not null # updated_at :datetime not null diff --git a/app/models/draft.rb b/app/models/draft.rb index 9905cbe1c57..04e38f564a8 100644 --- a/app/models/draft.rb +++ b/app/models/draft.rb @@ -104,7 +104,7 @@ end # # id :integer not null, primary key # user_id :integer not null -# draft_key :string not null +# draft_key :string(255) not null # data :text not null # created_at :datetime not null # updated_at :datetime not null diff --git a/app/models/draft_sequence.rb b/app/models/draft_sequence.rb index 9629e8402c0..ba5c901615f 100644 --- a/app/models/draft_sequence.rb +++ b/app/models/draft_sequence.rb @@ -33,7 +33,7 @@ end # # id :integer not null, primary key # user_id :integer not null -# draft_key :string not null +# draft_key :string(255) not null # sequence :integer not null # # Indexes diff --git a/app/models/email_log.rb b/app/models/email_log.rb index 769436ea017..ecb5d2182d0 100644 --- a/app/models/email_log.rb +++ b/app/models/email_log.rb @@ -84,8 +84,8 @@ end # Table name: email_logs # # id :integer not null, primary key -# to_address :string not null -# email_type :string not null +# to_address :string(255) not null +# email_type :string(255) not null # user_id :integer # created_at :datetime not null # updated_at :datetime not null diff --git a/app/models/email_token.rb b/app/models/email_token.rb index 2a10dd4e234..2338108ac4f 100644 --- a/app/models/email_token.rb +++ b/app/models/email_token.rb @@ -94,8 +94,8 @@ end # # id :integer not null, primary key # user_id :integer not null -# email :string not null -# token :string not null +# email :string(255) not null +# token :string(255) not null # confirmed :boolean default(FALSE), not null # expired :boolean default(FALSE), not null # created_at :datetime not null diff --git a/app/models/embeddable_host.rb b/app/models/embeddable_host.rb index c8cd6158cf6..a2d98761e95 100644 --- a/app/models/embeddable_host.rb +++ b/app/models/embeddable_host.rb @@ -67,10 +67,10 @@ end # Table name: embeddable_hosts # # id :integer not null, primary key -# host :string not null +# host :string(255) not null # category_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # path_whitelist :string # class_name :string # diff --git a/app/models/github_user_info.rb b/app/models/github_user_info.rb index 8e776f33ab1..c79a3b0e913 100644 --- a/app/models/github_user_info.rb +++ b/app/models/github_user_info.rb @@ -8,7 +8,7 @@ end # # id :integer not null, primary key # user_id :integer not null -# screen_name :string not null +# screen_name :string(255) not null # github_user_id :integer not null # created_at :datetime not null # updated_at :datetime not null diff --git a/app/models/google_user_info.rb b/app/models/google_user_info.rb index 343fe9945fd..26f3dda50dc 100644 --- a/app/models/google_user_info.rb +++ b/app/models/google_user_info.rb @@ -8,15 +8,15 @@ end # # id :integer not null, primary key # user_id :integer not null -# google_user_id :string not null -# first_name :string -# last_name :string -# email :string -# gender :string -# name :string -# link :string -# profile_link :string -# picture :string +# google_user_id :string(255) not null +# first_name :string(255) +# last_name :string(255) +# email :string(255) +# gender :string(255) +# name :string(255) +# link :string(255) +# profile_link :string(255) +# picture :string(255) # created_at :datetime not null # updated_at :datetime not null # diff --git a/app/models/group.rb b/app/models/group.rb index b3e2ce2f506..92c5f0fd4f4 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -749,7 +749,7 @@ end # Table name: groups # # id :integer not null, primary key -# name :string not null +# name :string(255) not null # created_at :datetime not null # updated_at :datetime not null # automatic :boolean default(FALSE), not null @@ -757,7 +757,7 @@ end # automatic_membership_email_domains :text # automatic_membership_retroactive :boolean default(FALSE) # primary_group :boolean default(FALSE), not null -# title :string +# title :string(255) # grant_trust_level :integer # incoming_email :string # has_messages :boolean default(FALSE), not null diff --git a/app/models/group_archived_message.rb b/app/models/group_archived_message.rb index 729ad8b82ad..fdd38888f3a 100644 --- a/app/models/group_archived_message.rb +++ b/app/models/group_archived_message.rb @@ -43,8 +43,8 @@ end # id :integer not null, primary key # group_id :integer not null # topic_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # # Indexes # diff --git a/app/models/group_mention.rb b/app/models/group_mention.rb index 3cef10dd735..30eb647ebc8 100644 --- a/app/models/group_mention.rb +++ b/app/models/group_mention.rb @@ -10,8 +10,8 @@ end # id :integer not null, primary key # post_id :integer # group_id :integer -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # # Indexes # diff --git a/app/models/invite.rb b/app/models/invite.rb index 2a7f96876aa..2346c0d7c5b 100644 --- a/app/models/invite.rb +++ b/app/models/invite.rb @@ -255,7 +255,7 @@ end # # id :integer not null, primary key # invite_key :string(32) not null -# email :string +# email :string(255) # invited_by_id :integer not null # user_id :integer # redeemed_at :datetime diff --git a/app/models/muted_user.rb b/app/models/muted_user.rb index 1ba464105d0..59f8089c6f7 100644 --- a/app/models/muted_user.rb +++ b/app/models/muted_user.rb @@ -10,8 +10,8 @@ end # id :integer not null, primary key # user_id :integer not null # muted_user_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # # Indexes # diff --git a/app/models/oauth2_user_info.rb b/app/models/oauth2_user_info.rb index 5b27d0cf710..7ce0cace41d 100644 --- a/app/models/oauth2_user_info.rb +++ b/app/models/oauth2_user_info.rb @@ -9,10 +9,10 @@ end # # id :integer not null, primary key # user_id :integer not null -# uid :string not null -# provider :string not null -# email :string -# name :string +# uid :string(255) not null +# provider :string(255) not null +# email :string(255) +# name :string(255) # created_at :datetime not null # updated_at :datetime not null # diff --git a/app/models/optimized_image.rb b/app/models/optimized_image.rb index 5e67cb84047..ee3404aa661 100644 --- a/app/models/optimized_image.rb +++ b/app/models/optimized_image.rb @@ -429,11 +429,14 @@ end # width :integer not null # height :integer not null # upload_id :integer not null -# url :string not null +# url :string(255) not null # filesize :integer +# etag :string +# version :integer # # Indexes # +# index_optimized_images_on_etag (etag) # index_optimized_images_on_upload_id (upload_id) # index_optimized_images_on_upload_id_and_width_and_height (upload_id,width,height) UNIQUE # diff --git a/app/models/permalink.rb b/app/models/permalink.rb index 6b3799a554a..c44d24dac96 100644 --- a/app/models/permalink.rb +++ b/app/models/permalink.rb @@ -101,8 +101,8 @@ end # topic_id :integer # post_id :integer # category_id :integer -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # external_url :string(1000) # # Indexes diff --git a/app/models/plugin_store_row.rb b/app/models/plugin_store_row.rb index d9bb1c05db6..db1d9d3fdab 100644 --- a/app/models/plugin_store_row.rb +++ b/app/models/plugin_store_row.rb @@ -6,9 +6,9 @@ end # Table name: plugin_store_rows # # id :integer not null, primary key -# plugin_name :string not null -# key :string not null -# type_name :string not null +# plugin_name :string(255) not null +# key :string(255) not null +# type_name :string(255) not null # value :text # # Indexes diff --git a/app/models/post.rb b/app/models/post.rb index 19d093d967b..71b50a463ec 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -925,7 +925,7 @@ end # notify_user_count :integer default(0), not null # like_score :integer default(0), not null # deleted_by_id :integer -# edit_reason :string +# edit_reason :string(255) # word_count :integer # version :integer default(1), not null # cook_method :integer default(1), not null @@ -938,7 +938,7 @@ end # via_email :boolean default(FALSE), not null # raw_email :text # public_version :integer default(1), not null -# action_code :string +# action_code :string(255) # image_url :string # locked_by_id :integer # diff --git a/app/models/post_detail.rb b/app/models/post_detail.rb index c43219749cc..8f888516732 100644 --- a/app/models/post_detail.rb +++ b/app/models/post_detail.rb @@ -11,8 +11,8 @@ end # # id :integer not null, primary key # post_id :integer -# key :string -# value :string +# key :string(255) +# value :string(255) # extra :text # created_at :datetime not null # updated_at :datetime not null diff --git a/app/models/post_search_data.rb b/app/models/post_search_data.rb index c30aa7a871e..5186ec3ca86 100644 --- a/app/models/post_search_data.rb +++ b/app/models/post_search_data.rb @@ -9,7 +9,7 @@ end # post_id :integer not null, primary key # search_data :tsvector # raw_data :text -# locale :string +# locale :string(255) # version :integer default(0) # # Indexes diff --git a/app/models/post_stat.rb b/app/models/post_stat.rb index 9de208b538d..ec293b66636 100644 --- a/app/models/post_stat.rb +++ b/app/models/post_stat.rb @@ -11,8 +11,8 @@ end # drafts_saved :integer # typing_duration_msecs :integer # composer_open_duration_msecs :integer -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # # Indexes # diff --git a/app/models/queued_post.rb b/app/models/queued_post.rb index 92cc688fa96..859796e037a 100644 --- a/app/models/queued_post.rb +++ b/app/models/queued_post.rb @@ -132,7 +132,7 @@ end # Table name: queued_posts # # id :integer not null, primary key -# queue :string not null +# queue :string(255) not null # state :integer not null # user_id :integer not null # raw :text not null @@ -142,8 +142,8 @@ end # approved_at :datetime # rejected_by_id :integer # rejected_at :datetime -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # # Indexes # diff --git a/app/models/remote_theme.rb b/app/models/remote_theme.rb index 5dbb3a9b15c..158e442b01c 100644 --- a/app/models/remote_theme.rb +++ b/app/models/remote_theme.rb @@ -236,14 +236,14 @@ end # id :integer not null, primary key # remote_url :string not null # remote_version :string -# branch :string # local_version :string # about_url :string # license_url :string # commits_behind :integer # remote_updated_at :datetime -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # private_key :text # last_error_text :text +# branch :string # diff --git a/app/models/screened_email.rb b/app/models/screened_email.rb index a0dec7f12f1..74c0c9593e9 100644 --- a/app/models/screened_email.rb +++ b/app/models/screened_email.rb @@ -67,7 +67,7 @@ end # Table name: screened_emails # # id :integer not null, primary key -# email :string not null +# email :string(255) not null # action_type :integer not null # match_count :integer default(0), not null # last_match_at :datetime @@ -77,6 +77,6 @@ end # # Indexes # -# index_screened_emails_on_email (email) UNIQUE -# index_screened_emails_on_last_match_at (last_match_at) +# index_blocked_emails_on_email (email) UNIQUE +# index_blocked_emails_on_last_match_at (last_match_at) # diff --git a/app/models/screened_url.rb b/app/models/screened_url.rb index 47e6e949db6..be97e0d8426 100644 --- a/app/models/screened_url.rb +++ b/app/models/screened_url.rb @@ -42,8 +42,8 @@ end # Table name: screened_urls # # id :integer not null, primary key -# url :string not null -# domain :string not null +# url :string(255) not null +# domain :string(255) not null # action_type :integer not null # match_count :integer default(0), not null # last_match_at :datetime diff --git a/app/models/single_sign_on_record.rb b/app/models/single_sign_on_record.rb index 1ceeacf5d6d..ade523e2941 100644 --- a/app/models/single_sign_on_record.rb +++ b/app/models/single_sign_on_record.rb @@ -10,13 +10,13 @@ end # # id :integer not null, primary key # user_id :integer not null -# external_id :string not null +# external_id :string(255) not null # last_payload :text not null # created_at :datetime not null # updated_at :datetime not null -# external_username :string -# external_email :string -# external_name :string +# external_username :string(255) +# external_email :string(255) +# external_name :string(255) # external_avatar_url :string(1000) # external_profile_background_url :string # external_card_background_url :string diff --git a/app/models/site_setting.rb b/app/models/site_setting.rb index 0bdf7b3000e..51ed549bce8 100644 --- a/app/models/site_setting.rb +++ b/app/models/site_setting.rb @@ -250,7 +250,7 @@ end # Table name: site_settings # # id :integer not null, primary key -# name :string not null +# name :string(255) not null # data_type :integer not null # value :text # created_at :datetime not null diff --git a/app/models/stylesheet_cache.rb b/app/models/stylesheet_cache.rb index b25fc51fa26..19b000b9e43 100644 --- a/app/models/stylesheet_cache.rb +++ b/app/models/stylesheet_cache.rb @@ -47,11 +47,11 @@ end # Table name: stylesheet_cache # # id :integer not null, primary key -# target :string not null -# digest :string not null +# target :string(255) not null +# digest :string(255) not null # content :text not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # theme_id :integer default(-1), not null # source_map :text # diff --git a/app/models/tag.rb b/app/models/tag.rb index 4e77af16d45..810654404c2 100644 --- a/app/models/tag.rb +++ b/app/models/tag.rb @@ -154,8 +154,8 @@ end # id :integer not null, primary key # name :string not null # topic_count :integer default(0), not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # pm_topic_count :integer default(0), not null # # Indexes diff --git a/app/models/tag_group.rb b/app/models/tag_group.rb index 5a5a74af02f..1f1fe99f009 100644 --- a/app/models/tag_group.rb +++ b/app/models/tag_group.rb @@ -87,8 +87,8 @@ end # # id :integer not null, primary key # name :string not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # parent_tag_id :integer # one_per_topic :boolean default(FALSE) # diff --git a/app/models/tag_group_membership.rb b/app/models/tag_group_membership.rb index 3bc5610e278..76e9be22c36 100644 --- a/app/models/tag_group_membership.rb +++ b/app/models/tag_group_membership.rb @@ -10,8 +10,8 @@ end # id :integer not null, primary key # tag_id :integer not null # tag_group_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # # Indexes # diff --git a/app/models/tag_user.rb b/app/models/tag_user.rb index b0697fa30d8..9c494f03cd8 100644 --- a/app/models/tag_user.rb +++ b/app/models/tag_user.rb @@ -159,8 +159,8 @@ end # tag_id :integer not null # user_id :integer not null # notification_level :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # # Indexes # diff --git a/app/models/theme.rb b/app/models/theme.rb index 29073467bfe..5d9bba43fd2 100644 --- a/app/models/theme.rb +++ b/app/models/theme.rb @@ -396,7 +396,7 @@ end # Table name: themes # # id :integer not null, primary key -# name :string not null +# name :string(255) not null # user_id :integer not null # created_at :datetime not null # updated_at :datetime not null diff --git a/app/models/theme_field.rb b/app/models/theme_field.rb index 07e6e3fd76d..4d4ee91091b 100644 --- a/app/models/theme_field.rb +++ b/app/models/theme_field.rb @@ -290,8 +290,8 @@ end # name :string(30) not null # value :text not null # value_baked :text -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # compiler_version :integer default(0), not null # error :string # upload_id :integer diff --git a/app/models/topic.rb b/app/models/topic.rb index b1baf0ecf0b..cd14cf97e17 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -1456,7 +1456,7 @@ end # Table name: topics # # id :integer not null, primary key -# title :string not null +# title :string(255) not null # last_posted_at :datetime # created_at :datetime not null # updated_at :datetime not null @@ -1471,7 +1471,7 @@ end # avg_time :integer # deleted_at :datetime # highest_post_number :integer default(0), not null -# image_url :string +# image_url :string(255) # like_count :integer default(0), not null # incoming_link_count :integer default(0), not null # category_id :integer @@ -1481,14 +1481,14 @@ end # archived :boolean default(FALSE), not null # bumped_at :datetime not null # has_summary :boolean default(FALSE), not null -# archetype :string default("regular"), not null +# archetype :string(255) default("regular"), not null # featured_user4_id :integer # notify_moderators_count :integer default(0), not null # spam_count :integer default(0), not null # pinned_at :datetime # score :float -# subtype :string -# slug :string +# subtype :string(255) +# slug :string(255) # deleted_by_id :integer # participant_count :integer default(1) # word_count :integer @@ -1504,7 +1504,7 @@ end # idx_topics_front_page (deleted_at,visible,archetype,category_id,id) # idx_topics_user_id_deleted_at (user_id) WHERE (deleted_at IS NULL) # idxtopicslug (slug) WHERE ((deleted_at IS NULL) AND (slug IS NOT NULL)) -# index_topics_on_bumped_at (bumped_at) +# index_forum_threads_on_bumped_at (bumped_at) # index_topics_on_created_at_and_visible (created_at,visible) WHERE ((deleted_at IS NULL) AND ((archetype)::text <> 'private_message'::text)) # index_topics_on_id_and_deleted_at (id,deleted_at) # index_topics_on_lower_title (lower((title)::text)) diff --git a/app/models/topic_link.rb b/app/models/topic_link.rb index a7be7fa00c3..39d57962d78 100644 --- a/app/models/topic_link.rb +++ b/app/models/topic_link.rb @@ -306,16 +306,16 @@ end # reflection :boolean default(FALSE) # clicks :integer default(0), not null # link_post_id :integer -# title :string +# title :string(255) # crawled_at :datetime # quote :boolean default(FALSE), not null # extension :string(10) # # Indexes # -# index_topic_links_on_extension (extension) -# index_topic_links_on_link_post_id_and_reflection (link_post_id,reflection) -# index_topic_links_on_post_id (post_id) -# index_topic_links_on_topic_id (topic_id) -# unique_post_links (topic_id,post_id,url) UNIQUE +# index_forum_thread_links_on_forum_thread_id (topic_id) +# index_forum_thread_links_on_forum_thread_id_and_post_id_and_url (topic_id,post_id,url) UNIQUE +# index_topic_links_on_extension (extension) +# index_topic_links_on_link_post_id_and_reflection (link_post_id,reflection) +# index_topic_links_on_post_id (post_id) # diff --git a/app/models/topic_link_click.rb b/app/models/topic_link_click.rb index 6caaff82d4a..8a232ea0642 100644 --- a/app/models/topic_link_click.rb +++ b/app/models/topic_link_click.rb @@ -125,5 +125,5 @@ end # # Indexes # -# by_link (topic_link_id) +# index_forum_thread_link_clicks_on_forum_thread_link_id (topic_link_id) # diff --git a/app/models/topic_search_data.rb b/app/models/topic_search_data.rb index 7203a84709b..cc43e87edbe 100644 --- a/app/models/topic_search_data.rb +++ b/app/models/topic_search_data.rb @@ -8,7 +8,7 @@ end # # topic_id :integer not null, primary key # raw_data :text -# locale :string not null +# locale :string(255) not null # search_data :tsvector # version :integer default(0) # diff --git a/app/models/topic_tag.rb b/app/models/topic_tag.rb index 22edeebad0c..2116f01b90f 100644 --- a/app/models/topic_tag.rb +++ b/app/models/topic_tag.rb @@ -42,8 +42,8 @@ end # id :integer not null, primary key # topic_id :integer not null # tag_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # # Indexes # diff --git a/app/models/topic_timer.rb b/app/models/topic_timer.rb index c8229bcca4c..6fcd0147b9b 100644 --- a/app/models/topic_timer.rb +++ b/app/models/topic_timer.rb @@ -166,8 +166,8 @@ end # based_on_last_post :boolean default(FALSE), not null # deleted_at :datetime # deleted_by_id :integer -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # category_id :integer # public_type :boolean default(TRUE) # diff --git a/app/models/topic_user.rb b/app/models/topic_user.rb index 8122286406b..40c8352d4cb 100644 --- a/app/models/topic_user.rb +++ b/app/models/topic_user.rb @@ -499,6 +499,6 @@ end # # Indexes # -# index_topic_users_on_topic_id_and_user_id (topic_id,user_id) UNIQUE -# index_topic_users_on_user_id_and_topic_id (user_id,topic_id) UNIQUE +# index_forum_thread_users_on_forum_thread_id_and_user_id (topic_id,user_id) UNIQUE +# index_topic_users_on_user_id_and_topic_id (user_id,topic_id) UNIQUE # diff --git a/app/models/unsubscribe_key.rb b/app/models/unsubscribe_key.rb index 7f5ee933cba..5f1e7b4cc81 100644 --- a/app/models/unsubscribe_key.rb +++ b/app/models/unsubscribe_key.rb @@ -30,8 +30,8 @@ end # # key :string(64) not null, primary key # user_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # unsubscribe_key_type :string # topic_id :integer # post_id :integer diff --git a/app/models/upload.rb b/app/models/upload.rb index c3fd30203d0..99982816601 100644 --- a/app/models/upload.rb +++ b/app/models/upload.rb @@ -276,11 +276,11 @@ end # # id :integer not null, primary key # user_id :integer not null -# original_filename :string not null +# original_filename :string(255) not null # filesize :integer not null # width :integer # height :integer -# url :string not null +# url :string(255) not null # created_at :datetime not null # updated_at :datetime not null # sha1 :string(40) @@ -293,10 +293,10 @@ end # # Indexes # +# index_uploads_on_etag (etag) # index_uploads_on_extension (lower((extension)::text)) # index_uploads_on_id_and_url (id,url) # index_uploads_on_sha1 (sha1) UNIQUE # index_uploads_on_url (url) # index_uploads_on_user_id (user_id) -# index_uploads_on_etag (etag) # diff --git a/app/models/user.rb b/app/models/user.rb index 1f47eaacb05..67d4f4fe861 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1405,7 +1405,7 @@ end # username :string(60) not null # created_at :datetime not null # updated_at :datetime not null -# name :string +# name :string(255) # seen_notification_id :integer default(0), not null # last_posted_at :datetime # password_hash :string(64) @@ -1427,10 +1427,10 @@ end # flag_level :integer default(0), not null # ip_address :inet # moderator :boolean default(FALSE) -# title :string +# title :string(255) # uploaded_avatar_id :integer -# locale :string(10) # primary_group_id :integer +# locale :string(10) # registration_ip_address :inet # staged :boolean default(FALSE), not null # first_seen_at :datetime diff --git a/app/models/user_action.rb b/app/models/user_action.rb index 4d9e86da4a0..1351445f809 100644 --- a/app/models/user_action.rb +++ b/app/models/user_action.rb @@ -467,9 +467,9 @@ end # # Indexes # -# idx_unique_rows (action_type,user_id,target_topic_id,target_post_id,acting_user_id) UNIQUE -# idx_user_actions_speed_up_user_all (user_id,created_at,action_type) -# index_user_actions_on_acting_user_id (acting_user_id) -# index_user_actions_on_target_post_id (target_post_id) -# index_user_actions_on_user_id_and_action_type (user_id,action_type) +# idx_unique_rows (action_type,user_id,target_topic_id,target_post_id,acting_user_id) UNIQUE +# idx_user_actions_speed_up_user_all (user_id,created_at,action_type) +# index_actions_on_acting_user_id (acting_user_id) +# index_actions_on_user_id_and_action_type (user_id,action_type) +# index_user_actions_on_target_post_id (target_post_id) # diff --git a/app/models/user_api_key.rb b/app/models/user_api_key.rb index cf9bc315c3d..a23c8dac1a5 100644 --- a/app/models/user_api_key.rb +++ b/app/models/user_api_key.rb @@ -76,8 +76,8 @@ end # key :string not null # application_name :string not null # push_url :string -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # revoked_at :datetime # scopes :text default([]), not null, is an Array # last_used_at :datetime not null diff --git a/app/models/user_archived_message.rb b/app/models/user_archived_message.rb index 6c2c604042f..7a52e3721bf 100644 --- a/app/models/user_archived_message.rb +++ b/app/models/user_archived_message.rb @@ -50,8 +50,8 @@ end # id :integer not null, primary key # user_id :integer not null # topic_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # # Indexes # diff --git a/app/models/user_auth_token.rb b/app/models/user_auth_token.rb index 0dcf75cbd30..5b62d14c4eb 100644 --- a/app/models/user_auth_token.rb +++ b/app/models/user_auth_token.rb @@ -237,8 +237,8 @@ end # auth_token_seen :boolean default(FALSE), not null # client_ip :inet # rotated_at :datetime not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # seen_at :datetime # # Indexes diff --git a/app/models/user_badge.rb b/app/models/user_badge.rb index 1e462878926..b42e5c88e61 100644 --- a/app/models/user_badge.rb +++ b/app/models/user_badge.rb @@ -49,5 +49,4 @@ end # index_user_badges_on_badge_id_and_user_id (badge_id,user_id) # index_user_badges_on_badge_id_and_user_id_and_post_id (badge_id,user_id,post_id) UNIQUE WHERE (post_id IS NOT NULL) # index_user_badges_on_badge_id_and_user_id_and_seq (badge_id,user_id,seq) UNIQUE WHERE (post_id IS NULL) -# index_user_badges_on_user_id (user_id) # diff --git a/app/models/user_email.rb b/app/models/user_email.rb index fca7a28967f..75528682c01 100644 --- a/app/models/user_email.rb +++ b/app/models/user_email.rb @@ -54,8 +54,8 @@ end # user_id :integer not null # email :string(513) not null # primary :boolean default(FALSE), not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # # Indexes # diff --git a/app/models/user_export.rb b/app/models/user_export.rb index 6db61c37252..7796975705e 100644 --- a/app/models/user_export.rb +++ b/app/models/user_export.rb @@ -22,9 +22,9 @@ end # Table name: user_exports # # id :integer not null, primary key -# file_name :string not null +# file_name :string(255) not null # user_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # upload_id :integer # diff --git a/app/models/user_field.rb b/app/models/user_field.rb index 27789fb07df..3647ce8ef23 100644 --- a/app/models/user_field.rb +++ b/app/models/user_field.rb @@ -16,12 +16,12 @@ end # Table name: user_fields # # id :integer not null, primary key -# name :string not null -# field_type :string not null -# created_at :datetime not null -# updated_at :datetime not null +# name :string(255) not null +# field_type :string(255) not null +# created_at :datetime +# updated_at :datetime # editable :boolean default(FALSE), not null -# description :string not null +# description :string(255) not null # required :boolean default(TRUE), not null # show_on_profile :boolean default(FALSE), not null # position :integer default(0) diff --git a/app/models/user_field_option.rb b/app/models/user_field_option.rb index a4412553425..2b3036fa40d 100644 --- a/app/models/user_field_option.rb +++ b/app/models/user_field_option.rb @@ -7,7 +7,7 @@ end # # id :integer not null, primary key # user_field_id :integer not null -# value :string not null -# created_at :datetime not null -# updated_at :datetime not null +# value :string(255) not null +# created_at :datetime +# updated_at :datetime # diff --git a/app/models/user_history.rb b/app/models/user_history.rb index 745188bc7ba..a040d18dc9e 100644 --- a/app/models/user_history.rb +++ b/app/models/user_history.rb @@ -218,23 +218,24 @@ end # details :text # created_at :datetime not null # updated_at :datetime not null -# context :string -# ip_address :string -# email :string +# context :string(255) +# ip_address :string(255) +# email :string(255) # subject :text # previous_value :text # new_value :text # topic_id :integer # admin_only :boolean default(FALSE) # post_id :integer -# custom_type :string +# custom_type :string(255) # category_id :integer # # Indexes # -# index_user_histories_on_acting_user_id_and_action_and_id (acting_user_id,action,id) -# index_user_histories_on_action_and_id (action,id) -# index_user_histories_on_category_id (category_id) -# index_user_histories_on_subject_and_id (subject,id) -# index_user_histories_on_target_user_id_and_id (target_user_id,id) +# index_staff_action_logs_on_action_and_id (action,id) +# index_staff_action_logs_on_subject_and_id (subject,id) +# index_staff_action_logs_on_target_user_id_and_id (target_user_id,id) +# index_user_histories_on_acting_user_id_and_action_and_id (acting_user_id,action,id) +# index_user_histories_on_category_id (category_id) +# index_user_histories_on_topic_id_and_target_user_id_and_action (topic_id,target_user_id,action) # diff --git a/app/models/user_open_id.rb b/app/models/user_open_id.rb index 188a04ef150..183f2414823 100644 --- a/app/models/user_open_id.rb +++ b/app/models/user_open_id.rb @@ -11,8 +11,8 @@ end # # id :integer not null, primary key # user_id :integer not null -# email :string not null -# url :string not null +# email :string(255) not null +# url :string(255) not null # created_at :datetime not null # updated_at :datetime not null # active :boolean not null diff --git a/app/models/user_profile.rb b/app/models/user_profile.rb index ffc62a263f3..e0ac1183a42 100644 --- a/app/models/user_profile.rb +++ b/app/models/user_profile.rb @@ -154,12 +154,12 @@ end # Table name: user_profiles # # user_id :integer not null, primary key -# location :string -# website :string +# location :string(255) +# website :string(255) # bio_raw :text # bio_cooked :text -# profile_background :string(255) # dismissed_banner_key :integer +# profile_background :string(255) # bio_cooked_version :integer # badge_granted_title :boolean default(FALSE) # card_background :string(255) diff --git a/app/models/user_warning.rb b/app/models/user_warning.rb index 612406ac0e9..dd89c7f9957 100644 --- a/app/models/user_warning.rb +++ b/app/models/user_warning.rb @@ -12,8 +12,8 @@ end # topic_id :integer not null # user_id :integer not null # created_by_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # # Indexes # diff --git a/app/models/watched_word.rb b/app/models/watched_word.rb index 73a3f661166..0861fb3a22d 100644 --- a/app/models/watched_word.rb +++ b/app/models/watched_word.rb @@ -60,8 +60,8 @@ end # id :integer not null, primary key # word :string not null # action :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # # Indexes # diff --git a/app/models/web_hook.rb b/app/models/web_hook.rb index b2fe649156c..9381748bf82 100644 --- a/app/models/web_hook.rb +++ b/app/models/web_hook.rb @@ -122,6 +122,6 @@ end # wildcard_web_hook :boolean default(FALSE), not null # verify_certificate :boolean default(TRUE), not null # active :boolean default(FALSE), not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # diff --git a/app/models/web_hook_event.rb b/app/models/web_hook_event.rb index 204efba8aaf..dc3e56d28ba 100644 --- a/app/models/web_hook_event.rb +++ b/app/models/web_hook_event.rb @@ -36,8 +36,8 @@ end # response_headers :string # response_body :text # duration :integer default(0) -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # # Indexes #