diff --git a/app/models/category.rb b/app/models/category.rb index 879a5a4def2..8022f580463 100644 --- a/app/models/category.rb +++ b/app/models/category.rb @@ -3,12 +3,6 @@ class Category < ActiveRecord::Base RESERVED_SLUGS = ["none"] - self.ignored_columns = [ - :suppress_from_latest, # TODO(2020-11-18): remove - :required_tag_group_id, # TODO(2023-04-01): remove - :min_tags_from_required_group, # TODO(2023-04-01): remove - ] - include Searchable include Positionable include HasCustomFields diff --git a/app/models/directory_column.rb b/app/models/directory_column.rb index 73a0762a1e8..abc3979369d 100644 --- a/app/models/directory_column.rb +++ b/app/models/directory_column.rb @@ -1,8 +1,6 @@ # frozen_string_literal: true class DirectoryColumn < ActiveRecord::Base - # TODO(2021-06-18): Remove automatic column - self.ignored_columns = ["automatic"] self.inheritance_column = nil enum type: { automatic: 0, user_field: 1, plugin: 2 }, _scopes: false diff --git a/app/models/email_token.rb b/app/models/email_token.rb index 5cfcfc446d8..b13370f06d8 100644 --- a/app/models/email_token.rb +++ b/app/models/email_token.rb @@ -40,9 +40,6 @@ class EmailToken < ActiveRecord::Base end end - # TODO(2022-01-01): Remove - self.ignored_columns = %w[token] - def self.scopes @scopes ||= Enum.new(signup: 1, password_reset: 2, email_login: 3, email_update: 4) end diff --git a/app/models/embeddable_host.rb b/app/models/embeddable_host.rb index 285c6fd1b79..52e24dfc19a 100644 --- a/app/models/embeddable_host.rb +++ b/app/models/embeddable_host.rb @@ -10,9 +10,6 @@ class EmbeddableHost < ActiveRecord::Base self.host.sub!(%r{/.*\z}, "") end - # TODO(2021-07-23): Remove - self.ignored_columns = ["path_whitelist"] - def self.record_for_url(uri) if uri.is_a?(String) uri = diff --git a/app/models/group.rb b/app/models/group.rb index 5e0928c11a5..875d3d1ca0e 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -3,9 +3,6 @@ require "net/imap" class Group < ActiveRecord::Base - # TODO(2021-05-26): remove - self.ignored_columns = %w[flair_url] - include HasCustomFields include AnonCacheInvalidator include HasDestroyedWebHook diff --git a/app/models/invite.rb b/app/models/invite.rb index 2aa7c91f6fd..16828d71622 100644 --- a/app/models/invite.rb +++ b/app/models/invite.rb @@ -13,9 +13,6 @@ class Invite < ActiveRecord::Base include RateLimiter::OnCreateRecord include Trashable - # TODO(2021-05-22): remove - self.ignored_columns = %w[user_id redeemed_at] - BULK_INVITE_EMAIL_LIMIT = 200 DOMAIN_REGEX = /\A(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)+([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])\z/ diff --git a/app/models/post.rb b/app/models/post.rb index 0d103d15e73..52517663688 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -10,11 +10,6 @@ class Post < ActiveRecord::Base include HasCustomFields include LimitedEdit - self.ignored_columns = [ - "avg_time", # TODO(2021-01-04): remove - "image_url", # TODO(2021-06-01): remove - ] - cattr_accessor :plugin_permitted_create_params, :plugin_permitted_update_params self.plugin_permitted_create_params = {} self.plugin_permitted_update_params = {} diff --git a/app/models/tag.rb b/app/models/tag.rb index b258cea67fd..c8fc99c1eea 100644 --- a/app/models/tag.rb +++ b/app/models/tag.rb @@ -5,10 +5,6 @@ class Tag < ActiveRecord::Base include HasDestroyedWebHook include HasSanitizableFields - self.ignored_columns = [ - "topic_count", # TODO(tgxworld): Remove on 1 July 2023 - ] - RESERVED_TAGS = [ "none", "constructor", # prevents issues with javascript's constructor of objects diff --git a/app/models/topic.rb b/app/models/topic.rb index 233a9aed103..88b09f41eb6 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -15,11 +15,6 @@ class Topic < ActiveRecord::Base EXTERNAL_ID_MAX_LENGTH = 50 - self.ignored_columns = [ - "avg_time", # TODO(2021-01-04): remove - "image_url", # TODO(2021-06-01): remove - ] - def_delegator :featured_users, :user_ids, :featured_user_ids def_delegator :featured_users, :choose, :feature_topic_users diff --git a/app/models/topic_user.rb b/app/models/topic_user.rb index cc9ce74b5c5..64a72ce854b 100644 --- a/app/models/topic_user.rb +++ b/app/models/topic_user.rb @@ -1,10 +1,6 @@ # frozen_string_literal: true class TopicUser < ActiveRecord::Base - self.ignored_columns = [ - :highest_seen_post_number, # Remove after 01 Jan 2022 - ] - belongs_to :user belongs_to :topic diff --git a/app/models/user_api_key.rb b/app/models/user_api_key.rb index 59815a5c70c..5325d646c57 100644 --- a/app/models/user_api_key.rb +++ b/app/models/user_api_key.rb @@ -1,10 +1,6 @@ # frozen_string_literal: true class UserApiKey < ActiveRecord::Base - self.ignored_columns = [ - "scopes", # TODO(2020-12-18): remove - ] - REVOKE_MATCHER = RouteMatcher.new(actions: "user_api_keys#revoke", methods: :post, params: [:id]) belongs_to :user diff --git a/app/models/user_option.rb b/app/models/user_option.rb index 18024366a12..21d635fcf83 100644 --- a/app/models/user_option.rb +++ b/app/models/user_option.rb @@ -13,11 +13,6 @@ class UserOption < ActiveRecord::Base # 8 => reserved for "hot" } - self.ignored_columns = [ - "disable_jump_reply", # Remove once 20210706091905 is promoted from post_deploy to regular migration - "sidebar_list_destination", # TODO(osama): Remove in January 2024 - ] - self.primary_key = :user_id belongs_to :user before_create :set_defaults diff --git a/app/models/user_profile.rb b/app/models/user_profile.rb index 91920dd9d70..31a6e8a8827 100644 --- a/app/models/user_profile.rb +++ b/app/models/user_profile.rb @@ -1,9 +1,6 @@ # frozen_string_literal: true class UserProfile < ActiveRecord::Base - # TODO Remove `badge_granted_title` after 2023-09-01 - self.ignored_columns = ["badge_granted_title"] - BAKED_VERSION = 1 belongs_to :user, inverse_of: :user_profile diff --git a/app/models/user_stat.rb b/app/models/user_stat.rb index 32e00681bd9..28efe39bb8b 100644 --- a/app/models/user_stat.rb +++ b/app/models/user_stat.rb @@ -3,9 +3,6 @@ class UserStat < ActiveRecord::Base belongs_to :user after_save :trigger_badges - # TODO(2021-05-13): Remove - self.ignored_columns = ["topic_reply_count"] - def self.ensure_consistency!(last_seen = 1.hour.ago) reset_bounce_scores update_distinct_badge_count