From 32c681c96bbca17f3dfcd3bb2e6049a30c28d3cd Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 23 Feb 2016 10:33:53 +1100 Subject: [PATCH] annotate models --- app/models/badge.rb | 7 +-- app/models/badge_grouping.rb | 2 +- app/models/badge_type.rb | 2 +- app/models/category.rb | 9 ++-- 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 | 6 +-- app/models/email_token.rb | 4 +- app/models/embeddable_host.rb | 2 +- app/models/facebook_user_info.rb | 14 +++--- app/models/github_user_info.rb | 2 +- app/models/google_user_info.rb | 18 ++++---- app/models/group.rb | 4 +- app/models/invite.rb | 2 +- app/models/notification.rb | 1 + app/models/oauth2_user_info.rb | 8 ++-- app/models/optimized_image.rb | 2 +- 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/queued_post.rb | 2 +- app/models/screened_email.rb | 2 +- app/models/screened_url.rb | 4 +- app/models/single_sign_on_record.rb | 10 ++-- app/models/site_customization.rb | 18 ++++---- app/models/site_setting.rb | 2 +- app/models/stylesheet_cache.rb | 4 +- app/models/topic.rb | 10 ++-- app/models/topic_link.rb | 2 +- app/models/twitter_user_info.rb | 2 +- app/models/upload.rb | 4 +- app/models/user.rb | 72 ++++++++++++++--------------- app/models/user_badge.rb | 1 + app/models/user_export.rb | 2 +- app/models/user_field.rb | 6 +-- app/models/user_field_option.rb | 2 +- app/models/user_history.rb | 8 ++-- app/models/user_open_id.rb | 4 +- app/models/user_option.rb | 27 +++++++++++ app/models/user_profile.rb | 4 +- lib/tasks/auto_annotate_models.rake | 4 +- 44 files changed, 166 insertions(+), 133 deletions(-) diff --git a/app/models/badge.rb b/app/models/badge.rb index 4fc46f0abf5..912f9207315 100644 --- a/app/models/badge.rb +++ b/app/models/badge.rb @@ -368,7 +368,7 @@ end # Table name: badges # # id :integer not null, primary key -# name :string(255) not null +# name :string not null # description :text # badge_type_id :integer not null # grant_count :integer default(0), not null @@ -376,7 +376,7 @@ end # updated_at :datetime not null # allow_title :boolean default(FALSE), not null # multiple_grant :boolean default(FALSE), not null -# icon :string(255) default("fa-certificate") +# icon :string default("fa-certificate") # listable :boolean default(TRUE) # target_posts :boolean default(FALSE) # query :text @@ -391,5 +391,6 @@ end # # Indexes # -# index_badges_on_name (name) UNIQUE +# index_badges_on_badge_type_id (badge_type_id) +# index_badges_on_name (name) UNIQUE # diff --git a/app/models/badge_grouping.rb b/app/models/badge_grouping.rb index f1201e72140..4fdcef66e3a 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(255) not null +# name :string 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 2d179a36e89..11d4a4b655b 100644 --- a/app/models/badge_type.rb +++ b/app/models/badge_type.rb @@ -13,7 +13,7 @@ end # Table name: badge_types # # id :integer not null, primary key -# name :string(255) not null +# name :string 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 2eab836c0c2..1b968ef8d1d 100644 --- a/app/models/category.rb +++ b/app/models/category.rb @@ -452,7 +452,7 @@ end # topics_year :integer default(0) # topics_month :integer default(0) # topics_week :integer default(0) -# slug :string(255) not null +# slug :string not null # description :text # text_color :string(6) default("FFFFFF"), not null # read_restricted :boolean default(FALSE), not null @@ -465,17 +465,18 @@ end # posts_year :integer default(0) # posts_month :integer default(0) # posts_week :integer default(0) -# email_in :string(255) +# email_in :string # email_in_allow_strangers :boolean default(FALSE) # topics_day :integer default(0) # posts_day :integer default(0) -# logo_url :string(255) -# background_url :string(255) +# logo_url :string +# background_url :string # allow_badges :boolean default(TRUE), not null # name_lower :string(50) not null # auto_close_based_on_last_post :boolean default(FALSE) # topic_template :text # suppress_from_homepage :boolean default(FALSE) +# contains_messages :boolean # # Indexes # diff --git a/app/models/color_scheme.rb b/app/models/color_scheme.rb index 7e431079409..0c1867f45e7 100644 --- a/app/models/color_scheme.rb +++ b/app/models/color_scheme.rb @@ -126,7 +126,7 @@ end # Table name: color_schemes # # id :integer not null, primary key -# name :string(255) not null +# name :string not null # enabled :boolean default(FALSE), not null # versioned_id :integer # version :integer default(1), not null diff --git a/app/models/color_scheme_color.rb b/app/models/color_scheme_color.rb index 39a7b51eec6..51e0c4ae8d0 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(255) not null -# hex :string(255) not null +# name :string not null +# hex :string 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 2e90ba445f9..437ad298fe3 100644 --- a/app/models/draft.rb +++ b/app/models/draft.rb @@ -59,7 +59,7 @@ end # # id :integer not null, primary key # user_id :integer not null -# draft_key :string(255) not null +# draft_key :string 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 7d15c6b9ac1..9a2e16cbe0a 100644 --- a/app/models/draft_sequence.rb +++ b/app/models/draft_sequence.rb @@ -34,7 +34,7 @@ end # # id :integer not null, primary key # user_id :integer not null -# draft_key :string(255) not null +# draft_key :string not null # sequence :integer not null # # Indexes diff --git a/app/models/email_log.rb b/app/models/email_log.rb index d806f3ef968..7a8e9ef6673 100644 --- a/app/models/email_log.rb +++ b/app/models/email_log.rb @@ -38,8 +38,8 @@ end # Table name: email_logs # # id :integer not null, primary key -# to_address :string(255) not null -# email_type :string(255) not null +# to_address :string not null +# email_type :string not null # user_id :integer # created_at :datetime not null # updated_at :datetime not null @@ -47,7 +47,7 @@ end # post_id :integer # topic_id :integer # skipped :boolean default(FALSE) -# skipped_reason :string(255) +# skipped_reason :string # # Indexes # diff --git a/app/models/email_token.rb b/app/models/email_token.rb index d08c09161ea..146c3d7c5e3 100644 --- a/app/models/email_token.rb +++ b/app/models/email_token.rb @@ -78,8 +78,8 @@ end # # id :integer not null, primary key # user_id :integer not null -# email :string(255) not null -# token :string(255) not null +# email :string not null +# token :string 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 98eb59a2f54..ffa1005c6f4 100644 --- a/app/models/embeddable_host.rb +++ b/app/models/embeddable_host.rb @@ -36,7 +36,7 @@ end # Table name: embeddable_hosts # # id :integer not null, primary key -# host :string(255) not null +# host :string not null # category_id :integer not null # created_at :datetime # updated_at :datetime diff --git a/app/models/facebook_user_info.rb b/app/models/facebook_user_info.rb index 8ef00720e4e..96958598019 100644 --- a/app/models/facebook_user_info.rb +++ b/app/models/facebook_user_info.rb @@ -9,13 +9,13 @@ end # id :integer not null, primary key # user_id :integer not null # facebook_user_id :integer not null -# username :string(255) -# first_name :string(255) -# last_name :string(255) -# email :string(255) -# gender :string(255) -# name :string(255) -# link :string(255) +# username :string +# first_name :string +# last_name :string +# email :string +# gender :string +# name :string +# link :string # created_at :datetime not null # updated_at :datetime not null # diff --git a/app/models/github_user_info.rb b/app/models/github_user_info.rb index c79a3b0e913..8e776f33ab1 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(255) not null +# screen_name :string 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 26f3dda50dc..343fe9945fd 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(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) +# 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 # created_at :datetime not null # updated_at :datetime not null # diff --git a/app/models/group.rb b/app/models/group.rb index 148b1e9e8d1..413d17b4497 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -455,7 +455,7 @@ end # Table name: groups # # id :integer not null, primary key -# name :string(255) not null +# name :string not null # created_at :datetime not null # updated_at :datetime not null # automatic :boolean default(FALSE), not null @@ -465,7 +465,7 @@ end # automatic_membership_email_domains :text # automatic_membership_retroactive :boolean default(FALSE) # primary_group :boolean default(FALSE), not null -# title :string(255) +# title :string # grant_trust_level :integer # incoming_email :string # has_messages :boolean default(FALSE), not null diff --git a/app/models/invite.rb b/app/models/invite.rb index a2fdc3403d3..d6e0f02fb27 100644 --- a/app/models/invite.rb +++ b/app/models/invite.rb @@ -252,7 +252,7 @@ end # # id :integer not null, primary key # invite_key :string(32) not null -# email :string(255) +# email :string # invited_by_id :integer not null # user_id :integer # redeemed_at :datetime diff --git a/app/models/notification.rb b/app/models/notification.rb index d21875c8b2c..3e0e55d26ad 100644 --- a/app/models/notification.rb +++ b/app/models/notification.rb @@ -203,5 +203,6 @@ end # idx_notifications_speedup_unread_count (user_id,notification_type) # index_notifications_on_post_action_id (post_action_id) # index_notifications_on_user_id_and_created_at (user_id,created_at) +# index_notifications_on_user_id_and_id (user_id,id) UNIQUE # index_notifications_on_user_id_and_topic_id_and_post_number (user_id,topic_id,post_number) # diff --git a/app/models/oauth2_user_info.rb b/app/models/oauth2_user_info.rb index 7ce0cace41d..5b27d0cf710 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(255) not null -# provider :string(255) not null -# email :string(255) -# name :string(255) +# uid :string not null +# provider :string not null +# email :string +# name :string # 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 482585e8ea7..f316a8d2dfa 100644 --- a/app/models/optimized_image.rb +++ b/app/models/optimized_image.rb @@ -236,7 +236,7 @@ end # width :integer not null # height :integer not null # upload_id :integer not null -# url :string(255) not null +# url :string not null # # Indexes # diff --git a/app/models/plugin_store_row.rb b/app/models/plugin_store_row.rb index db1d9d3fdab..d9bb1c05db6 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(255) not null -# key :string(255) not null -# type_name :string(255) not null +# plugin_name :string not null +# key :string not null +# type_name :string not null # value :text # # Indexes diff --git a/app/models/post.rb b/app/models/post.rb index 3f93899ff8b..dfed7e86f1b 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -653,7 +653,7 @@ end # notify_user_count :integer default(0), not null # like_score :integer default(0), not null # deleted_by_id :integer -# edit_reason :string(255) +# edit_reason :string # word_count :integer # version :integer default(1), not null # cook_method :integer default(1), not null @@ -666,7 +666,7 @@ end # via_email :boolean default(FALSE), not null # raw_email :text # public_version :integer default(1), not null -# action_code :string(255) +# action_code :string # # Indexes # diff --git a/app/models/post_detail.rb b/app/models/post_detail.rb index 8f888516732..c43219749cc 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(255) -# value :string(255) +# key :string +# value :string # 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 1611df2718b..f9ee72b885a 100644 --- a/app/models/post_search_data.rb +++ b/app/models/post_search_data.rb @@ -11,7 +11,7 @@ end # post_id :integer not null, primary key # search_data :tsvector # raw_data :text -# locale :string(255) +# locale :string # # Indexes # diff --git a/app/models/queued_post.rb b/app/models/queued_post.rb index fa1f4112085..66e75e96012 100644 --- a/app/models/queued_post.rb +++ b/app/models/queued_post.rb @@ -114,7 +114,7 @@ end # Table name: queued_posts # # id :integer not null, primary key -# queue :string(255) not null +# queue :string not null # state :integer not null # user_id :integer not null # raw :text not null diff --git a/app/models/screened_email.rb b/app/models/screened_email.rb index 4cbe1657416..ee8b005728e 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(255) not null +# email :string not null # action_type :integer not null # match_count :integer default(0), not null # last_match_at :datetime diff --git a/app/models/screened_url.rb b/app/models/screened_url.rb index 5abe8aced91..3bd7cc1b897 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(255) not null -# domain :string(255) not null +# url :string not null +# domain :string 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 bbccfcb6c96..cb1219855f4 100644 --- a/app/models/single_sign_on_record.rb +++ b/app/models/single_sign_on_record.rb @@ -8,14 +8,14 @@ end # # id :integer not null, primary key # user_id :integer not null -# external_id :string(255) not null +# external_id :string not null # last_payload :text not null # created_at :datetime not null # updated_at :datetime not null -# external_username :string(255) -# external_email :string(255) -# external_name :string(255) -# external_avatar_url :string(255) +# external_username :string +# external_email :string +# external_name :string +# external_avatar_url :string # # Indexes # diff --git a/app/models/site_customization.rb b/app/models/site_customization.rb index 501c7208458..bc83a126bdb 100644 --- a/app/models/site_customization.rb +++ b/app/models/site_customization.rb @@ -217,32 +217,32 @@ end # Table name: site_customizations # # id :integer not null, primary key -# name :string(255) not null +# name :string not null # stylesheet :text # header :text -# header_baked :text # user_id :integer not null # enabled :boolean not null -# key :string(255) not null +# key :string not null # created_at :datetime not null # updated_at :datetime not null # stylesheet_baked :text default(""), not null # mobile_stylesheet :text +# mobile_header :text # mobile_stylesheet_baked :text # footer :text -# footer_baked :text -# mobile_header :text # mobile_footer :text -# mobile_header_baked :text -# mobile_footer_baked :text # head_tag :text # body_tag :text -# head_tag_baked :text -# body_tag_baked :text # top :text # mobile_top :text # embedded_css :text # embedded_css_baked :text +# head_tag_baked :text +# body_tag_baked :text +# header_baked :text +# mobile_header_baked :text +# footer_baked :text +# mobile_footer_baked :text # # Indexes # diff --git a/app/models/site_setting.rb b/app/models/site_setting.rb index ad84ea68101..2a7c7e79d01 100644 --- a/app/models/site_setting.rb +++ b/app/models/site_setting.rb @@ -112,7 +112,7 @@ end # Table name: site_settings # # id :integer not null, primary key -# name :string(255) not null +# name :string 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 a5397ef1590..c9dfa867623 100644 --- a/app/models/stylesheet_cache.rb +++ b/app/models/stylesheet_cache.rb @@ -34,8 +34,8 @@ end # Table name: stylesheet_cache # # id :integer not null, primary key -# target :string(255) not null -# digest :string(255) not null +# target :string not null +# digest :string not null # content :text not null # created_at :datetime # updated_at :datetime diff --git a/app/models/topic.rb b/app/models/topic.rb index 7a370a92616..0ded2ab50a1 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -1051,7 +1051,7 @@ end # Table name: topics # # id :integer not null, primary key -# title :string(255) not null +# title :string not null # last_posted_at :datetime # created_at :datetime not null # updated_at :datetime not null @@ -1066,7 +1066,7 @@ end # avg_time :integer # deleted_at :datetime # highest_post_number :integer default(0), not null -# image_url :string(255) +# image_url :string # off_topic_count :integer default(0), not null # like_count :integer default(0), not null # incoming_link_count :integer default(0), not null @@ -1079,7 +1079,7 @@ end # bumped_at :datetime not null # has_summary :boolean default(FALSE), not null # vote_count :integer default(0), not null -# archetype :string(255) default("regular"), not null +# archetype :string default("regular"), not null # featured_user4_id :integer # notify_moderators_count :integer default(0), not null # spam_count :integer default(0), not null @@ -1089,8 +1089,8 @@ end # score :float # percent_rank :float default(1.0), not null # notify_user_count :integer default(0), not null -# subtype :string(255) -# slug :string(255) +# subtype :string +# slug :string # auto_close_at :datetime # auto_close_user_id :integer # auto_close_started_at :datetime diff --git a/app/models/topic_link.rb b/app/models/topic_link.rb index ce55d512c7a..98eefbcd81e 100644 --- a/app/models/topic_link.rb +++ b/app/models/topic_link.rb @@ -231,7 +231,7 @@ end # reflection :boolean default(FALSE) # clicks :integer default(0), not null # link_post_id :integer -# title :string(255) +# title :string # crawled_at :datetime # quote :boolean default(FALSE), not null # diff --git a/app/models/twitter_user_info.rb b/app/models/twitter_user_info.rb index 42d4f4d83cf..0927c009ae9 100644 --- a/app/models/twitter_user_info.rb +++ b/app/models/twitter_user_info.rb @@ -8,7 +8,7 @@ end # # id :integer not null, primary key # user_id :integer not null -# screen_name :string(255) not null +# screen_name :string not null # twitter_user_id :integer not null # created_at :datetime not null # updated_at :datetime not null diff --git a/app/models/upload.rb b/app/models/upload.rb index 49480639d43..060cf187ab0 100644 --- a/app/models/upload.rb +++ b/app/models/upload.rb @@ -257,11 +257,11 @@ end # # id :integer not null, primary key # user_id :integer not null -# original_filename :string(255) not null +# original_filename :string not null # filesize :integer not null # width :integer # height :integer -# url :string(255) not null +# url :string not null # created_at :datetime not null # updated_at :datetime not null # sha1 :string(40) diff --git a/app/models/user.rb b/app/models/user.rb index 71ee83831a2..667cfb6b55f 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -956,42 +956,42 @@ end # # Table name: users # -# id :integer not null, primary key -# username :string(60) not null -# created_at :datetime not null -# updated_at :datetime not null -# name :string(255) -# seen_notification_id :integer default(0), not null -# last_posted_at :datetime -# email :string(513) not null -# password_hash :string(64) -# salt :string(32) -# active :boolean default(FALSE), not null -# username_lower :string(60) not null -# auth_token :string(32) -# last_seen_at :datetime -# admin :boolean default(FALSE), not null -# last_emailed_at :datetime -# trust_level :integer not null -# approved :boolean default(FALSE), not null -# approved_by_id :integer -# approved_at :datetime -# previous_visit_at :datetime -# suspended_at :datetime -# suspended_till :datetime -# date_of_birth :date -# views :integer default(0), not null -# flag_level :integer default(0), not null -# ip_address :inet -# moderator :boolean default(FALSE) -# blocked :boolean default(FALSE) -# title :string(255) -# uploaded_avatar_id :integer -# primary_group_id :integer -# locale :string(10) -# registration_ip_address :inet -# trust_level_locked :boolean default(FALSE), not null -# staged :boolean default(FALSE), not null +# id :integer not null, primary key +# username :string(60) not null +# created_at :datetime not null +# updated_at :datetime not null +# name :string +# seen_notification_id :integer default(0), not null +# last_posted_at :datetime +# email :string(513) not null +# password_hash :string(64) +# salt :string(32) +# active :boolean default(FALSE), not null +# username_lower :string(60) not null +# auth_token :string(32) +# last_seen_at :datetime +# admin :boolean default(FALSE), not null +# last_emailed_at :datetime +# trust_level :integer not null +# approved :boolean default(FALSE), not null +# approved_by_id :integer +# approved_at :datetime +# previous_visit_at :datetime +# suspended_at :datetime +# suspended_till :datetime +# date_of_birth :date +# views :integer default(0), not null +# flag_level :integer default(0), not null +# ip_address :inet +# moderator :boolean default(FALSE) +# blocked :boolean default(FALSE) +# title :string +# uploaded_avatar_id :integer +# locale :string(10) +# primary_group_id :integer +# registration_ip_address :inet +# trust_level_locked :boolean default(FALSE), not null +# staged :boolean default(FALSE), not null # # Indexes # diff --git a/app/models/user_badge.rb b/app/models/user_badge.rb index f78ed824bb0..a50bf1be726 100644 --- a/app/models/user_badge.rb +++ b/app/models/user_badge.rb @@ -39,4 +39,5 @@ 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 # index_user_badges_on_badge_id_and_user_id_and_seq (badge_id,user_id,seq) UNIQUE +# index_user_badges_on_user_id (user_id) # diff --git a/app/models/user_export.rb b/app/models/user_export.rb index 2895c48ff97..d231c21b364 100644 --- a/app/models/user_export.rb +++ b/app/models/user_export.rb @@ -33,7 +33,7 @@ end # Table name: user_exports # # id :integer not null, primary key -# file_name :string(255) not null +# file_name :string not null # user_id :integer not null # created_at :datetime # updated_at :datetime diff --git a/app/models/user_field.rb b/app/models/user_field.rb index c39644a6098..7086f1e0e2b 100644 --- a/app/models/user_field.rb +++ b/app/models/user_field.rb @@ -13,12 +13,12 @@ end # Table name: user_fields # # id :integer not null, primary key -# name :string(255) not null -# field_type :string(255) not null +# name :string not null +# field_type :string not null # created_at :datetime # updated_at :datetime # editable :boolean default(FALSE), not null -# description :string(255) not null +# description :string 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 2b3036fa40d..56299f3ee95 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(255) not null +# value :string not null # created_at :datetime # updated_at :datetime # diff --git a/app/models/user_history.rb b/app/models/user_history.rb index e742631f377..1ce5021501b 100644 --- a/app/models/user_history.rb +++ b/app/models/user_history.rb @@ -155,16 +155,16 @@ end # details :text # created_at :datetime not null # updated_at :datetime not null -# context :string(255) -# ip_address :string(255) -# email :string(255) +# context :string +# ip_address :string +# email :string # subject :text # previous_value :text # new_value :text # topic_id :integer # admin_only :boolean default(FALSE) # post_id :integer -# custom_type :string(255) +# custom_type :string # category_id :integer # # Indexes diff --git a/app/models/user_open_id.rb b/app/models/user_open_id.rb index 183f2414823..188a04ef150 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(255) not null -# url :string(255) not null +# email :string not null +# url :string not null # created_at :datetime not null # updated_at :datetime not null # active :boolean not null diff --git a/app/models/user_option.rb b/app/models/user_option.rb index e6384f061b2..53e9bbad790 100644 --- a/app/models/user_option.rb +++ b/app/models/user_option.rb @@ -103,3 +103,30 @@ class UserOption < ActiveRecord::Base end end + +# == Schema Information +# +# Table name: user_options +# +# user_id :integer not null, primary key +# email_always :boolean default(FALSE), not null +# mailing_list_mode :boolean default(FALSE), not null +# email_digests :boolean +# email_direct :boolean default(TRUE), not null +# email_private_messages :boolean default(TRUE), not null +# external_links_in_new_tab :boolean default(FALSE), not null +# enable_quoting :boolean default(TRUE), not null +# dynamic_favicon :boolean default(FALSE), not null +# disable_jump_reply :boolean default(FALSE), not null +# edit_history_public :boolean default(FALSE), not null +# automatically_unpin_topics :boolean default(TRUE), not null +# digest_after_days :integer +# auto_track_topics_after_msecs :integer +# new_topic_duration_minutes :integer +# last_redirected_to_top_at :datetime +# email_previous_replies :integer default(1), not null +# +# Indexes +# +# index_user_options_on_user_id (user_id) UNIQUE +# diff --git a/app/models/user_profile.rb b/app/models/user_profile.rb index 38b04b74d5b..2dca5c2f109 100644 --- a/app/models/user_profile.rb +++ b/app/models/user_profile.rb @@ -106,8 +106,8 @@ end # Table name: user_profiles # # user_id :integer not null, primary key -# location :string(255) -# website :string(255) +# location :string +# website :string # bio_raw :text # bio_cooked :text # profile_background :string(255) diff --git a/lib/tasks/auto_annotate_models.rake b/lib/tasks/auto_annotate_models.rake index fb1be240b3f..dde0cc03644 100644 --- a/lib/tasks/auto_annotate_models.rake +++ b/lib/tasks/auto_annotate_models.rake @@ -1,7 +1,7 @@ # NOTE: only doing this in development as some production environments (Heroku) # NOTE: are sensitive to local FS writes, and besides -- it's just not proper # NOTE: to have a dev-mode tool do its thing in production. -if(Rails.env.development?) +if(Rails.env.development? || Rails.env.test?) task :set_annotation_options do # You can override any of these by setting an environment variable of the # same name. @@ -18,8 +18,10 @@ if(Rails.env.development?) 'require' => "", 'exclude_tests' => "true", 'exclude_fixtures' => "true", + 'exclude_helpers' => "true", 'exclude_factories' => "true", 'exclude_serializers' => "true", + 'exclude_controllers' => "true", 'ignore_model_sub_dir' => "false", 'skip_on_db_migrate' => "true", 'format_bare' => "true",