From 6373de550f5d9175de3afb2a815e568c1d268d25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Tue, 8 Apr 2014 17:35:44 +0200 Subject: [PATCH] update annotations --- app/models/api_key.rb | 4 ++-- app/models/category.rb | 10 +++++----- app/models/category_featured_topic.rb | 5 ++--- app/models/category_featured_user.rb | 5 ++--- app/models/category_group.rb | 5 ++--- app/models/category_search_data.rb | 1 - app/models/draft.rb | 5 ++--- app/models/draft_sequence.rb | 1 - app/models/email_log.rb | 4 ++-- app/models/email_token.rb | 5 ++--- app/models/facebook_user_info.rb | 4 ++-- app/models/github_user_info.rb | 5 ++--- app/models/group.rb | 4 ++-- app/models/group_user.rb | 5 ++--- app/models/incoming_link.rb | 4 ++-- app/models/invite.rb | 4 ++-- app/models/notification.rb | 5 ++--- app/models/oauth2_user_info.rb | 5 ++--- app/models/optimized_image.rb | 1 - app/models/plugin_store_row.rb | 1 - app/models/post.rb | 6 +++--- app/models/post_action.rb | 5 ++--- app/models/post_action_type.rb | 5 ++--- app/models/post_detail.rb | 4 ++-- app/models/post_reply.rb | 5 ++--- app/models/post_search_data.rb | 1 - app/models/post_timing.rb | 1 - app/models/post_upload.rb | 1 - app/models/screened_email.rb | 8 ++++---- app/models/screened_ip_address.rb | 4 ++-- app/models/screened_url.rb | 4 ++-- app/models/site_content.rb | 5 ++--- app/models/site_customization.rb | 5 ++--- app/models/site_setting.rb | 5 ++--- app/models/top_topic.rb | 8 ++++---- app/models/topic.rb | 7 ++++--- app/models/topic_allowed_group.rb | 1 - app/models/topic_allowed_user.rb | 5 ++--- app/models/topic_embed.rb | 2 +- app/models/topic_invite.rb | 5 ++--- app/models/topic_link.rb | 11 ++++++----- app/models/topic_link_click.rb | 6 +++--- app/models/topic_user.rb | 2 +- app/models/twitter_user_info.rb | 5 ++--- app/models/upload.rb | 4 ++-- app/models/user.rb | 6 +++--- app/models/user_action.rb | 11 +++++------ app/models/user_history.rb | 10 +++++----- app/models/user_open_id.rb | 5 ++--- app/models/user_search_data.rb | 1 - 50 files changed, 102 insertions(+), 129 deletions(-) diff --git a/app/models/api_key.rb b/app/models/api_key.rb index c1daf8ad085..2e75818f2cb 100644 --- a/app/models/api_key.rb +++ b/app/models/api_key.rb @@ -29,8 +29,8 @@ end # key :string(64) not null # user_id :integer # created_by_id :integer -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # # Indexes # diff --git a/app/models/category.rb b/app/models/category.rb index 2b1a3966e40..d590ffa784c 100644 --- a/app/models/category.rb +++ b/app/models/category.rb @@ -334,8 +334,8 @@ end # color :string(6) default("AB9364"), not null # topic_id :integer # topic_count :integer default(0), not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # user_id :integer not null # topics_year :integer default(0) # topics_month :integer default(0) @@ -360,7 +360,7 @@ end # # Indexes # -# index_categories_on_email_in (email_in) UNIQUE -# index_categories_on_forum_thread_count (topic_count) -# index_categories_on_name (name) UNIQUE +# index_categories_on_email_in (email_in) UNIQUE +# index_categories_on_name (name) UNIQUE +# index_categories_on_topic_count (topic_count) # diff --git a/app/models/category_featured_topic.rb b/app/models/category_featured_topic.rb index 6ffe0fb6d30..2324a9fd3ab 100644 --- a/app/models/category_featured_topic.rb +++ b/app/models/category_featured_topic.rb @@ -52,8 +52,8 @@ end # # category_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 # rank :integer default(0), not null # id :integer not null, primary key # @@ -62,4 +62,3 @@ end # cat_featured_threads (category_id,topic_id) UNIQUE # index_category_featured_topics_on_category_id_and_rank (category_id,rank) # - diff --git a/app/models/category_featured_user.rb b/app/models/category_featured_user.rb index 33268879b0c..50656dd13fd 100644 --- a/app/models/category_featured_user.rb +++ b/app/models/category_featured_user.rb @@ -53,11 +53,10 @@ end # id :integer not null, primary key # category_id :integer # user_id :integer -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # # Indexes # # index_category_featured_users_on_category_id_and_user_id (category_id,user_id) UNIQUE # - diff --git a/app/models/category_group.rb b/app/models/category_group.rb index 49cf5172bb5..d7f70007b69 100644 --- a/app/models/category_group.rb +++ b/app/models/category_group.rb @@ -15,8 +15,7 @@ end # id :integer not null, primary key # category_id :integer not null # group_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # permission_type :integer default(1) # - diff --git a/app/models/category_search_data.rb b/app/models/category_search_data.rb index 76feabbcc6d..269ab3f137f 100644 --- a/app/models/category_search_data.rb +++ b/app/models/category_search_data.rb @@ -15,4 +15,3 @@ end # # idx_search_category (search_data) # - diff --git a/app/models/draft.rb b/app/models/draft.rb index 3f0527c8813..2a881f39102 100644 --- a/app/models/draft.rb +++ b/app/models/draft.rb @@ -46,12 +46,11 @@ end # user_id :integer not null # draft_key :string(255) not null # data :text not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # sequence :integer default(0), not null # # Indexes # # index_drafts_on_user_id_and_draft_key (user_id,draft_key) # - diff --git a/app/models/draft_sequence.rb b/app/models/draft_sequence.rb index ef0d63ef21b..e576dd1083a 100644 --- a/app/models/draft_sequence.rb +++ b/app/models/draft_sequence.rb @@ -37,4 +37,3 @@ end # # index_draft_sequences_on_user_id_and_draft_key (user_id,draft_key) UNIQUE # - diff --git a/app/models/email_log.rb b/app/models/email_log.rb index a187f6800ea..af3f47096aa 100644 --- a/app/models/email_log.rb +++ b/app/models/email_log.rb @@ -37,8 +37,8 @@ end # 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 +# created_at :datetime +# updated_at :datetime # reply_key :string(32) # post_id :integer # topic_id :integer diff --git a/app/models/email_token.rb b/app/models/email_token.rb index 289ebd9efde..97bac40f151 100644 --- a/app/models/email_token.rb +++ b/app/models/email_token.rb @@ -73,11 +73,10 @@ end # token :string(255) not null # confirmed :boolean default(FALSE), not null # expired :boolean default(FALSE), not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # # Indexes # # index_email_tokens_on_token (token) UNIQUE # - diff --git a/app/models/facebook_user_info.rb b/app/models/facebook_user_info.rb index 8ef00720e4e..e2f10a26847 100644 --- a/app/models/facebook_user_info.rb +++ b/app/models/facebook_user_info.rb @@ -16,8 +16,8 @@ end # gender :string(255) # name :string(255) # link :string(255) -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # # Indexes # diff --git a/app/models/github_user_info.rb b/app/models/github_user_info.rb index 762b459d5bc..1b4349313a8 100644 --- a/app/models/github_user_info.rb +++ b/app/models/github_user_info.rb @@ -10,12 +10,11 @@ end # user_id :integer not null # screen_name :string(255) not null # github_user_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # # Indexes # # index_github_user_infos_on_github_user_id (github_user_id) UNIQUE # index_github_user_infos_on_user_id (user_id) UNIQUE # - diff --git a/app/models/group.rb b/app/models/group.rb index 646e667c383..d6807934d85 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -235,8 +235,8 @@ end # # id :integer not null, primary key # name :string(255) not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # automatic :boolean default(FALSE), not null # user_count :integer default(0), not null # alias_level :integer default(0) diff --git a/app/models/group_user.rb b/app/models/group_user.rb index 36d5789685c..1a0a0cc5a00 100644 --- a/app/models/group_user.rb +++ b/app/models/group_user.rb @@ -10,11 +10,10 @@ end # id :integer not null, primary key # group_id :integer not null # user_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # # Indexes # # index_group_users_on_group_id_and_user_id (group_id,user_id) UNIQUE # - diff --git a/app/models/incoming_link.rb b/app/models/incoming_link.rb index 757bdeea483..ca00c8d5217 100644 --- a/app/models/incoming_link.rb +++ b/app/models/incoming_link.rb @@ -104,8 +104,8 @@ end # domain :string(100) # topic_id :integer # post_number :integer -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # user_id :integer # ip_address :inet # current_user_id :integer diff --git a/app/models/invite.rb b/app/models/invite.rb index 11c07bd9ee7..40651861e61 100644 --- a/app/models/invite.rb +++ b/app/models/invite.rb @@ -127,8 +127,8 @@ end # invited_by_id :integer not null # user_id :integer # redeemed_at :datetime -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # deleted_at :datetime # deleted_by_id :integer # invalidated_at :datetime diff --git a/app/models/notification.rb b/app/models/notification.rb index b90ad746190..f88916d8d97 100644 --- a/app/models/notification.rb +++ b/app/models/notification.rb @@ -142,8 +142,8 @@ end # user_id :integer not null # data :string(1000) not null # read :boolean default(FALSE), not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # topic_id :integer # post_number :integer # post_action_id :integer @@ -153,4 +153,3 @@ end # index_notifications_on_post_action_id (post_action_id) # index_notifications_on_user_id_and_created_at (user_id,created_at) # - diff --git a/app/models/oauth2_user_info.rb b/app/models/oauth2_user_info.rb index ca39927a270..a3034b00a08 100644 --- a/app/models/oauth2_user_info.rb +++ b/app/models/oauth2_user_info.rb @@ -13,11 +13,10 @@ end # provider :string(255) not null # email :string(255) # name :string(255) -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # # Indexes # # index_oauth2_user_infos_on_uid_and_provider (uid,provider) UNIQUE # - diff --git a/app/models/optimized_image.rb b/app/models/optimized_image.rb index e25e4b460a0..220751e1e54 100644 --- a/app/models/optimized_image.rb +++ b/app/models/optimized_image.rb @@ -87,4 +87,3 @@ end # 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/plugin_store_row.rb b/app/models/plugin_store_row.rb index 4928f4adb58..db1d9d3fdab 100644 --- a/app/models/plugin_store_row.rb +++ b/app/models/plugin_store_row.rb @@ -15,4 +15,3 @@ end # # index_plugin_store_rows_on_plugin_name_and_key (plugin_name,key) UNIQUE # - diff --git a/app/models/post.rb b/app/models/post.rb index 297c910a9b5..d658dbb4c0f 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -503,8 +503,8 @@ end # post_number :integer not null # raw :text not null # cooked :text not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # reply_to_post_number :integer # reply_count :integer default(0), not null # quote_count :integer default(0), not null @@ -543,5 +543,5 @@ end # idx_posts_created_at_topic_id (created_at,topic_id) # idx_posts_user_id_deleted_at (user_id) # index_posts_on_reply_to_post_number (reply_to_post_number) -# index_posts_on_topic_id_and_post_number (topic_id,post_number) UNIQUE +# index_posts_on_topic_id_and_post_number (topic_id,post_number) # diff --git a/app/models/post_action.rb b/app/models/post_action.rb index 00eb658bf7e..4b7d28807ca 100644 --- a/app/models/post_action.rb +++ b/app/models/post_action.rb @@ -335,8 +335,8 @@ end # user_id :integer not null # post_action_type_id :integer not null # deleted_at :datetime -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # deleted_by_id :integer # message :text # related_post_id :integer @@ -350,4 +350,3 @@ end # idx_unique_actions (user_id,post_action_type_id,post_id,deleted_at) UNIQUE # index_post_actions_on_post_id (post_id) # - diff --git a/app/models/post_action_type.rb b/app/models/post_action_type.rb index ca8d5dbaf32..90b7f330ffc 100644 --- a/app/models/post_action_type.rb +++ b/app/models/post_action_type.rb @@ -45,9 +45,8 @@ end # name_key :string(50) not null # is_flag :boolean default(FALSE), not null # icon :string(20) -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # id :integer not null, primary key # position :integer default(0), not null # - diff --git a/app/models/post_detail.rb b/app/models/post_detail.rb index 8f888516732..2fd28b1f1e8 100644 --- a/app/models/post_detail.rb +++ b/app/models/post_detail.rb @@ -14,8 +14,8 @@ end # key :string(255) # value :string(255) # extra :text -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # # Indexes # diff --git a/app/models/post_reply.rb b/app/models/post_reply.rb index c350b30e998..d7de2240d9f 100644 --- a/app/models/post_reply.rb +++ b/app/models/post_reply.rb @@ -11,11 +11,10 @@ end # # post_id :integer # reply_id :integer -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # # Indexes # # index_post_replies_on_post_id_and_reply_id (post_id,reply_id) UNIQUE # - diff --git a/app/models/post_search_data.rb b/app/models/post_search_data.rb index 42745d698c9..8ebab6ed79c 100644 --- a/app/models/post_search_data.rb +++ b/app/models/post_search_data.rb @@ -15,4 +15,3 @@ end # # idx_search_post (search_data) # - diff --git a/app/models/post_timing.rb b/app/models/post_timing.rb index b8e86c8f3c6..489b14f73fa 100644 --- a/app/models/post_timing.rb +++ b/app/models/post_timing.rb @@ -104,4 +104,3 @@ end # post_timings_summary (topic_id,post_number) # post_timings_unique (topic_id,post_number,user_id) UNIQUE # - diff --git a/app/models/post_upload.rb b/app/models/post_upload.rb index e48dd1974ac..f341877ff7b 100644 --- a/app/models/post_upload.rb +++ b/app/models/post_upload.rb @@ -15,4 +15,3 @@ end # # idx_unique_post_uploads (post_id,upload_id) UNIQUE # - diff --git a/app/models/screened_email.rb b/app/models/screened_email.rb index 99c940b03a6..5aa98a30f08 100644 --- a/app/models/screened_email.rb +++ b/app/models/screened_email.rb @@ -33,12 +33,12 @@ end # action_type :integer not null # match_count :integer default(0), not null # last_match_at :datetime -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # ip_address :inet # # Indexes # -# index_blocked_emails_on_email (email) UNIQUE -# index_blocked_emails_on_last_match_at (last_match_at) +# index_screened_emails_on_email (email) UNIQUE +# index_screened_emails_on_last_match_at (last_match_at) # diff --git a/app/models/screened_ip_address.rb b/app/models/screened_ip_address.rb index f750865edfa..68e9a80059d 100644 --- a/app/models/screened_ip_address.rb +++ b/app/models/screened_ip_address.rb @@ -92,8 +92,8 @@ end # action_type :integer not null # match_count :integer default(0), not null # last_match_at :datetime -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # # Indexes # diff --git a/app/models/screened_url.rb b/app/models/screened_url.rb index 5abe8aced91..3b543c7d77c 100644 --- a/app/models/screened_url.rb +++ b/app/models/screened_url.rb @@ -47,8 +47,8 @@ end # action_type :integer not null # match_count :integer default(0), not null # last_match_at :datetime -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # ip_address :inet # # Indexes diff --git a/app/models/site_content.rb b/app/models/site_content.rb index f3a56e144bb..46aed053c75 100644 --- a/app/models/site_content.rb +++ b/app/models/site_content.rb @@ -37,11 +37,10 @@ end # # content_type :string(255) not null, primary key # content :text not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # # Indexes # # index_site_contents_on_content_type (content_type) UNIQUE # - diff --git a/app/models/site_customization.rb b/app/models/site_customization.rb index 4b642f50a79..2c8a9d9fbd2 100644 --- a/app/models/site_customization.rb +++ b/app/models/site_customization.rb @@ -215,8 +215,8 @@ end # user_id :integer not null # enabled :boolean not null # key :string(255) not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # override_default_style :boolean default(FALSE), not null # stylesheet_baked :text default(""), not null # mobile_stylesheet :text @@ -227,4 +227,3 @@ end # # index_site_customizations_on_key (key) # - diff --git a/app/models/site_setting.rb b/app/models/site_setting.rb index e65a3121714..a7945e170aa 100644 --- a/app/models/site_setting.rb +++ b/app/models/site_setting.rb @@ -115,7 +115,6 @@ end # name :string(255) not null # data_type :integer not null # value :text -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # - diff --git a/app/models/top_topic.rb b/app/models/top_topic.rb index 81f5e59fdbc..68882ea5de9 100644 --- a/app/models/top_topic.rb +++ b/app/models/top_topic.rb @@ -151,10 +151,10 @@ end # daily_posts_count :integer default(0), not null # daily_views_count :integer default(0), not null # daily_likes_count :integer default(0), not null -# yearly_score :float -# monthly_score :float -# weekly_score :float -# daily_score :float +# yearly_score :float default(0.0) +# monthly_score :float default(0.0) +# weekly_score :float default(0.0) +# daily_score :float default(0.0) # # Indexes # diff --git a/app/models/topic.rb b/app/models/topic.rb index 2dc476c89db..bf7a6b9dc28 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -741,8 +741,8 @@ end # id :integer not null, primary key # title :string(255) not null # last_posted_at :datetime -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # views :integer default(0), not null # posts_count :integer default(0), not null # user_id :integer @@ -788,11 +788,12 @@ end # participant_count :integer default(1) # word_count :integer # excerpt :string(1000) +# pinned_globally :boolean default(FALSE), not null # # Indexes # # idx_topics_front_page (deleted_at,visible,archetype,category_id,id) # idx_topics_user_id_deleted_at (user_id) -# index_forum_threads_on_bumped_at (bumped_at) +# index_topics_on_bumped_at (bumped_at) # index_topics_on_id_and_deleted_at (id,deleted_at) # diff --git a/app/models/topic_allowed_group.rb b/app/models/topic_allowed_group.rb index c001b7f6c91..670bc208054 100644 --- a/app/models/topic_allowed_group.rb +++ b/app/models/topic_allowed_group.rb @@ -18,4 +18,3 @@ end # index_topic_allowed_groups_on_group_id_and_topic_id (group_id,topic_id) UNIQUE # index_topic_allowed_groups_on_topic_id_and_group_id (topic_id,group_id) UNIQUE # - diff --git a/app/models/topic_allowed_user.rb b/app/models/topic_allowed_user.rb index 0f33f079ae1..24f15544897 100644 --- a/app/models/topic_allowed_user.rb +++ b/app/models/topic_allowed_user.rb @@ -12,12 +12,11 @@ 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 # # index_topic_allowed_users_on_topic_id_and_user_id (topic_id,user_id) UNIQUE # index_topic_allowed_users_on_user_id_and_topic_id (user_id,topic_id) UNIQUE # - diff --git a/app/models/topic_embed.rb b/app/models/topic_embed.rb index 96a06397dd3..4f122ae4020 100644 --- a/app/models/topic_embed.rb +++ b/app/models/topic_embed.rb @@ -157,7 +157,7 @@ end # topic_id :integer not null # post_id :integer not null # embed_url :string(255) not null -# content_sha1 :string(40) not null +# content_sha1 :string(40) # created_at :datetime # updated_at :datetime # diff --git a/app/models/topic_invite.rb b/app/models/topic_invite.rb index 19157d98d38..2536d12530b 100644 --- a/app/models/topic_invite.rb +++ b/app/models/topic_invite.rb @@ -15,12 +15,11 @@ end # id :integer not null, primary key # topic_id :integer not null # invite_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # # Indexes # # index_topic_invites_on_invite_id (invite_id) # index_topic_invites_on_topic_id_and_invite_id (topic_id,invite_id) UNIQUE # - diff --git a/app/models/topic_link.rb b/app/models/topic_link.rb index b1fd9f04048..b6de3234289 100644 --- a/app/models/topic_link.rb +++ b/app/models/topic_link.rb @@ -208,15 +208,16 @@ end # domain :string(100) not null # internal :boolean default(FALSE), not null # link_topic_id :integer -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # reflection :boolean default(FALSE) # clicks :integer default(0), not null # link_post_id :integer +# title :string(255) +# crawled_at :datetime # # Indexes # -# 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_topic_id (topic_id) +# unique_post_links (topic_id,post_id,url) UNIQUE # - diff --git a/app/models/topic_link_click.rb b/app/models/topic_link_click.rb index 575b6a1e882..7599ed9a76f 100644 --- a/app/models/topic_link_click.rb +++ b/app/models/topic_link_click.rb @@ -58,11 +58,11 @@ end # id :integer not null, primary key # topic_link_id :integer not null # user_id :integer -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # ip_address :inet not null # # Indexes # -# index_forum_thread_link_clicks_on_forum_thread_link_id (topic_link_id) +# by_link (topic_link_id) # diff --git a/app/models/topic_user.rb b/app/models/topic_user.rb index 4053dd78af3..7181206e128 100644 --- a/app/models/topic_user.rb +++ b/app/models/topic_user.rb @@ -279,5 +279,5 @@ end # # Indexes # -# index_forum_thread_users_on_forum_thread_id_and_user_id (topic_id,user_id) UNIQUE +# index_topic_users_on_topic_id_and_user_id (topic_id,user_id) UNIQUE # diff --git a/app/models/twitter_user_info.rb b/app/models/twitter_user_info.rb index 8d7b75c12d4..cbb5c4c21c6 100644 --- a/app/models/twitter_user_info.rb +++ b/app/models/twitter_user_info.rb @@ -10,12 +10,11 @@ end # user_id :integer not null # screen_name :string(255) not null # twitter_user_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # # Indexes # # index_twitter_user_infos_on_twitter_user_id (twitter_user_id) UNIQUE # index_twitter_user_infos_on_user_id (user_id) UNIQUE # - diff --git a/app/models/upload.rb b/app/models/upload.rb index 0708198b2dd..d4733e63a05 100644 --- a/app/models/upload.rb +++ b/app/models/upload.rb @@ -108,8 +108,8 @@ end # width :integer # height :integer # url :string(255) not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # sha1 :string(40) # origin :string(1000) # diff --git a/app/models/user.rb b/app/models/user.rb index 5fd7de682a8..5db3e8cb90c 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -688,8 +688,8 @@ end # # id :integer not null, primary key # username :string(20) not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # name :string(255) # bio_raw :text # seen_notification_id :integer default(0), not null @@ -733,8 +733,8 @@ end # uploaded_avatar_id :integer # email_always :boolean default(FALSE), not null # mailing_list_mode :boolean default(FALSE), not null -# primary_group_id :integer # locale :string(10) +# primary_group_id :integer # profile_background :string(255) # # Indexes diff --git a/app/models/user_action.rb b/app/models/user_action.rb index cf887edd2c2..da4cba31aa4 100644 --- a/app/models/user_action.rb +++ b/app/models/user_action.rb @@ -313,13 +313,12 @@ end # target_post_id :integer # target_user_id :integer # acting_user_id :integer -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # # Indexes # -# idx_unique_rows (action_type,user_id,target_topic_id,target_post_id,acting_user_id) UNIQUE -# index_actions_on_acting_user_id (acting_user_id) -# index_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 +# index_user_actions_on_acting_user_id (acting_user_id) +# index_user_actions_on_user_id_and_action_type (user_id,action_type) # - diff --git a/app/models/user_history.rb b/app/models/user_history.rb index bc4033c2c6d..ab0c5bbaff0 100644 --- a/app/models/user_history.rb +++ b/app/models/user_history.rb @@ -104,8 +104,8 @@ end # acting_user_id :integer # target_user_id :integer # details :text -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # context :string(255) # ip_address :string(255) # email :string(255) @@ -117,8 +117,8 @@ end # # Indexes # -# 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_action_and_id (action,id) +# index_user_histories_on_subject_and_id (subject,id) +# index_user_histories_on_target_user_id_and_id (target_user_id,id) # diff --git a/app/models/user_open_id.rb b/app/models/user_open_id.rb index 860734081c2..b460bc6f99e 100644 --- a/app/models/user_open_id.rb +++ b/app/models/user_open_id.rb @@ -13,12 +13,11 @@ end # user_id :integer not null # email :string(255) not null # url :string(255) not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # active :boolean not null # # Indexes # # index_user_open_ids_on_url (url) # - diff --git a/app/models/user_search_data.rb b/app/models/user_search_data.rb index 509d03cb91f..0ca6c1ca568 100644 --- a/app/models/user_search_data.rb +++ b/app/models/user_search_data.rb @@ -14,4 +14,3 @@ end # # idx_search_user (search_data) # -