Skip to content

A platform for community discussion. Free, open, simple.

MT: Sync migrations schema config with recent core schema changes (#42202)

David Battersbyc676dc323245
diff --git a/migrations/converters/lib/migrations/converters/discourse/steps/user_options.rb b/migrations/converters/lib/migrations/converters/discourse/steps/user_options.rb
index 956545cb2b3..c4ffbef0d0b 100644
--- a/migrations/converters/lib/migrations/converters/discourse/steps/user_options.rb
+++ b/migrations/converters/lib/migrations/converters/discourse/steps/user_options.rb
@@ -12,6 +12,7 @@ module Migrations
user_id: item[:user_id],
allow_private_messages: item[:allow_private_messages],
auto_track_topics_after_msecs: item[:auto_track_topics_after_msecs],
+ automatically_translate: item[:automatically_translate],
automatically_unpin_topics: item[:automatically_unpin_topics],
bookmark_auto_delete_preference: item[:bookmark_auto_delete_preference],
color_scheme_id: item[:color_scheme_id],
@@ -49,6 +50,7 @@ module Migrations
oldest_search_log_date: item[:oldest_search_log_date],
push_notification_level: item[:push_notification_level],
seen_popups: item[:seen_popups],
+ send_shortcut: item[:send_shortcut],
show_original_content: item[:show_original_content],
sidebar_link_to_filtered_list: item[:sidebar_link_to_filtered_list],
sidebar_show_count_of_new_items: item[:sidebar_show_count_of_new_items],
@@ -60,6 +62,7 @@ module Migrations
timezone: item[:timezone],
title_count_mode_key: item[:title_count_mode_key],
topics_unread_when_closed: item[:topics_unread_when_closed],
+ understood_languages: item[:understood_languages],
watched_precedence_over_muted: item[:watched_precedence_over_muted],
)
end
diff --git a/migrations/core/db/intermediate_db_schema/100-base-schema.sql b/migrations/core/db/intermediate_db_schema/100-base-schema.sql
index 21e5e45cb7c..5988103fa23 100644
--- a/migrations/core/db/intermediate_db_schema/100-base-schema.sql
+++ b/migrations/core/db/intermediate_db_schema/100-base-schema.sql
@@ -512,6 +512,7 @@ CREATE TABLE user_options
user_id NUMERIC NOT NULL PRIMARY KEY,
allow_private_messages BOOLEAN,
auto_track_topics_after_msecs INTEGER,
+ automatically_translate BOOLEAN,
automatically_unpin_topics BOOLEAN,
bookmark_auto_delete_preference INTEGER,
color_scheme_id NUMERIC,
@@ -548,6 +549,7 @@ CREATE TABLE user_options
oldest_search_log_date DATETIME,
push_notification_level INTEGER,
seen_popups INTEGER,
+ send_shortcut INTEGER,
show_original_content BOOLEAN,
sidebar_link_to_filtered_list BOOLEAN,
sidebar_show_count_of_new_items BOOLEAN,
@@ -559,6 +561,7 @@ CREATE TABLE user_options
timezone TEXT,
title_count_mode_key INTEGER,
topics_unread_when_closed BOOLEAN,
+ understood_languages TEXT,
watched_precedence_over_muted BOOLEAN
);
diff --git a/migrations/core/lib/migrations/database/intermediate_db/enums/site_setting_datatype.rb b/migrations/core/lib/migrations/database/intermediate_db/enums/site_setting_datatype.rb
index 20c01e139a2..926578ce96a 100644
--- a/migrations/core/lib/migrations/database/intermediate_db/enums/site_setting_datatype.rb
+++ b/migrations/core/lib/migrations/database/intermediate_db/enums/site_setting_datatype.rb
@@ -43,6 +43,7 @@ module Migrations
TOPIC = 30
DATETIME = 31
ICON = 32
+ DATE = 33
end
end
end
diff --git a/migrations/core/lib/migrations/database/intermediate_db/user_option.rb b/migrations/core/lib/migrations/database/intermediate_db/user_option.rb
index 3dda642d5ed..26afcf02436 100644
--- a/migrations/core/lib/migrations/database/intermediate_db/user_option.rb
+++ b/migrations/core/lib/migrations/database/intermediate_db/user_option.rb
@@ -13,6 +13,7 @@ module Migrations
user_id,
allow_private_messages,
auto_track_topics_after_msecs,
+ automatically_translate,
automatically_unpin_topics,
bookmark_auto_delete_preference,
color_scheme_id,
@@ -49,6 +50,7 @@ module Migrations
oldest_search_log_date,
push_notification_level,
seen_popups,
+ send_shortcut,
show_original_content,
sidebar_link_to_filtered_list,
sidebar_show_count_of_new_items,
@@ -60,10 +62,11 @@ module Migrations
timezone,
title_count_mode_key,
topics_unread_when_closed,
+ understood_languages,
watched_precedence_over_muted
)
VALUES (
- ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?
+ ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?
)
SQL
private_constant :SQL
@@ -73,6 +76,7 @@ module Migrations
# @param user_id [Integer, String]
# @param allow_private_messages [Boolean, nil]
# @param auto_track_topics_after_msecs [Integer, nil]
+ # @param automatically_translate [Boolean, nil]
# @param automatically_unpin_topics [Boolean, nil]
# @param bookmark_auto_delete_preference [Integer, nil]
# @param color_scheme_id [Integer, String, nil]
@@ -109,6 +113,7 @@ module Migrations
# @param oldest_search_log_date [Time, nil]
# @param push_notification_level [Integer, nil]
# @param seen_popups [Integer, nil]
+ # @param send_shortcut [Integer, nil]
# @param show_original_content [Boolean, nil]
# @param sidebar_link_to_filtered_list [Boolean, nil]
# @param sidebar_show_count_of_new_items [Boolean, nil]
@@ -120,6 +125,7 @@ module Migrations
# @param timezone [String, nil]
# @param title_count_mode_key [Integer, nil]
# @param topics_unread_when_closed [Boolean, nil]
+ # @param understood_languages [String, nil]
# @param watched_precedence_over_muted [Boolean, nil]
#
# @return [void]
@@ -127,6 +133,7 @@ module Migrations
user_id:,
allow_private_messages: nil,
auto_track_topics_after_msecs: nil,
+ automatically_translate: nil,
automatically_unpin_topics: nil,
bookmark_auto_delete_preference: nil,
color_scheme_id: nil,
@@ -163,6 +170,7 @@ module Migrations
oldest_search_log_date: nil,
push_notification_level: nil,
seen_popups: nil,
+ send_shortcut: nil,
show_original_content: nil,
sidebar_link_to_filtered_list: nil,
sidebar_show_count_of_new_items: nil,
@@ -174,6 +182,7 @@ module Migrations
timezone: nil,
title_count_mode_key: nil,
topics_unread_when_closed: nil,
+ understood_languages: nil,
watched_precedence_over_muted: nil
)
Migrations::Database::IntermediateDB.insert(
@@ -181,6 +190,7 @@ module Migrations
user_id,
Migrations::Database.format_boolean(allow_private_messages),
auto_track_topics_after_msecs,
+ Migrations::Database.format_boolean(automatically_translate),
Migrations::Database.format_boolean(automatically_unpin_topics),
bookmark_auto_delete_preference,
color_scheme_id,
@@ -217,6 +227,7 @@ module Migrations
Migrations::Database.format_datetime(oldest_search_log_date),
push_notification_level,
seen_popups,
+ send_shortcut,
Migrations::Database.format_boolean(show_original_content),
Migrations::Database.format_boolean(sidebar_link_to_filtered_list),
Migrations::Database.format_boolean(sidebar_show_count_of_new_items),
@@ -228,6 +239,7 @@ module Migrations
timezone,
title_count_mode_key,
Migrations::Database.format_boolean(topics_unread_when_closed),
+ understood_languages,
Migrations::Database.format_boolean(watched_precedence_over_muted),
)
end
diff --git a/migrations/tooling/config/schema/intermediate_db/ignored.rb b/migrations/tooling/config/schema/intermediate_db/ignored.rb
index 51fd83b30f7..012f1574b77 100644
--- a/migrations/tooling/config/schema/intermediate_db/ignored.rb
+++ b/migrations/tooling/config/schema/intermediate_db/ignored.rb
@@ -152,7 +152,9 @@ Migrations::Tooling::Schema.ignored do
tables :admin_dashboard_reports,
:admin_dashboard_sections,
:browser_pageview_country_daily_rollups,
- :browser_pageview_referrer_daily_rollups
+ :browser_pageview_referrer_daily_rollups,
+ :category_activity_daily_rollups,
+ :user_visit_daily_rollups
tables :access_control_lists,
:admin_notices,
diff --git a/migrations/tooling/config/schema/intermediate_db/tables/tags.rb b/migrations/tooling/config/schema/intermediate_db/tables/tags.rb
index d29b1f63a0d..6975b0bb4cd 100644
--- a/migrations/tooling/config/schema/intermediate_db/tables/tags.rb
+++ b/migrations/tooling/config/schema/intermediate_db/tables/tags.rb
@@ -1,7 +1,12 @@
# frozen_string_literal: true
Migrations::Tooling::Schema.table :tags do
- ignore :pm_topic_count, :public_topic_count, :staff_topic_count, reason: "Calculated columns"
+ ignore :description_cooked,
+ :description_cooked_version,
+ :pm_topic_count,
+ :public_topic_count,
+ :staff_topic_count,
+ reason: "Calculated columns"
ignore :target_tag_id, reason: "We have the `tag_synonyms` table for this"
end