Skip to content

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

MT: Resync schema and coverage after rebase on main

Gerhard Schlagerf39d2634fa46
diff --git a/migrations/converters/lib/migrations/converters/discourse/steps/topics.rb b/migrations/converters/lib/migrations/converters/discourse/steps/topics.rb
index 6a47acf5de6..11b9327c5d7 100644
--- a/migrations/converters/lib/migrations/converters/discourse/steps/topics.rb
+++ b/migrations/converters/lib/migrations/converters/discourse/steps/topics.rb
@@ -15,12 +15,22 @@ module Migrations
def items
@source_db.query <<~SQL
- SELECT * FROM topics
+ SELECT t.*,
+ up.url AS og_image_url,
+ up.original_filename AS og_image_filename,
+ up.origin AS og_image_origin,
+ up.user_id AS og_image_user_id
+ FROM topics t
+ LEFT JOIN uploads up ON t.og_image_upload_id = up.id
SQL
end
end
processor do
+ def setup
+ @og_image_upload_creator = UploadCreator.new(column_prefix: "og_image")
+ end
+
def process(item)
IntermediateDB::Topic.create(
original_id: item[:id],
@@ -35,6 +45,7 @@ module Migrations
external_id: item[:external_id],
featured_link: item[:featured_link],
locale: item[:locale],
+ og_image_upload_id: @og_image_upload_creator.create_for(item),
pinned_at: item[:pinned_at],
pinned_globally: item[:pinned_globally],
pinned_until: item[:pinned_until],
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 d7caeaa97a3..0924f3842ce 100644
--- a/migrations/core/db/intermediate_db_schema/100-base-schema.sql
+++ b/migrations/core/db/intermediate_db_schema/100-base-schema.sql
@@ -369,6 +369,7 @@ CREATE TABLE topics
external_id NUMERIC,
featured_link TEXT,
locale TEXT,
+ og_image_upload_id TEXT,
pinned_at DATETIME,
pinned_globally BOOLEAN,
pinned_until DATETIME,
diff --git a/migrations/core/lib/migrations/database/intermediate_db/topic.rb b/migrations/core/lib/migrations/database/intermediate_db/topic.rb
index 1ae9340a6c0..84ecc3ec057 100644
--- a/migrations/core/lib/migrations/database/intermediate_db/topic.rb
+++ b/migrations/core/lib/migrations/database/intermediate_db/topic.rb
@@ -22,6 +22,7 @@ module Migrations
external_id,
featured_link,
locale,
+ og_image_upload_id,
pinned_at,
pinned_globally,
pinned_until,
@@ -34,7 +35,7 @@ module Migrations
visible
)
VALUES (
- ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?
+ ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?
)
SQL
private_constant :SQL
@@ -53,6 +54,7 @@ module Migrations
# @param external_id [Integer, String, nil]
# @param featured_link [String, nil]
# @param locale [String, nil]
+ # @param og_image_upload_id [String, nil]
# @param pinned_at [Time, nil]
# @param pinned_globally [Boolean, nil]
# @param pinned_until [Time, nil]
@@ -78,6 +80,7 @@ module Migrations
external_id: nil,
featured_link: nil,
locale: nil,
+ og_image_upload_id: nil,
pinned_at: nil,
pinned_globally: nil,
pinned_until: nil,
@@ -103,6 +106,7 @@ module Migrations
external_id,
featured_link,
locale,
+ og_image_upload_id,
Migrations::Database.format_datetime(pinned_at),
Migrations::Database.format_boolean(pinned_globally),
Migrations::Database.format_datetime(pinned_until),
diff --git a/migrations/tooling/config/schema/intermediate_db/ignored.rb b/migrations/tooling/config/schema/intermediate_db/ignored.rb
index c334fce2031..dabf744cb65 100644
--- a/migrations/tooling/config/schema/intermediate_db/ignored.rb
+++ b/migrations/tooling/config/schema/intermediate_db/ignored.rb
@@ -208,6 +208,7 @@ Migrations::Tooling::Schema.ignored do
:sidebar_sections,
:sidebar_urls,
:site_setting_groups,
+ :site_setting_localizations,
:sitemaps,
:skipped_email_logs,
:stylesheet_cache,
diff --git a/migrations/tooling/config/schema/plugin_manifest.yml b/migrations/tooling/config/schema/plugin_manifest.yml
index 21718d9353f..3e0d842cb8d 100644
--- a/migrations/tooling/config/schema/plugin_manifest.yml
+++ b/migrations/tooling/config/schema/plugin_manifest.yml
@@ -202,6 +202,7 @@ plugins:
- discourse_workflows_executions
- discourse_workflows_variables
- discourse_workflows_webhooks
+ - discourse_workflows_workflow_call_runs
- discourse_workflows_workflow_dependencies
- discourse_workflows_workflow_publish_history
- discourse_workflows_workflow_versions
@@ -218,10 +219,10 @@ plugin_checksums:
chat: eed419ab29ae9cb0a73a32c0e7be9d6c
discourse-adplugin: 9e52419decf1099c5bc301a90e6cc91a
discourse-affiliate: '08c6e1a851441a082e9be9ddddc63910'
- discourse-ai: 0eb3819de9ca86f22434718c56a58d1b
+ discourse-ai: b003fddae4787fa026ad65139e982da1
discourse-assign: 7a7a36e8ac0214e8a6aca1a1ed9899aa
discourse-cakeday: a5bb91366c8dc8d267088eb0c2679187
- discourse-calendar: f61c87be8f574bba58a658b73748aa84
+ discourse-calendar: 07aa9951f5fde7daf03be9edfbda4dec
discourse-chat-integration: ffa3bf5dba9089491d2fc02971eb96f8
discourse-data-explorer: ba288745bea628996590debdf02fbaa4
discourse-gamification: 633256e241b030fddcc059076f7474f8
@@ -244,7 +245,7 @@ plugin_checksums:
discourse-templates: a131c89a3e2b765f1eb6ec811c0fecea
discourse-topic-voting: 5464e186402b9589d71f338c704a7d21
discourse-user-notes: 4c1e04fac5708b51c1b09bd8ed0d786c
- discourse-workflows: 4163c85f5edd2e854973b1601060df26
+ discourse-workflows: 5644f9ffebcee089e85b16edab52a6a3
discourse-zendesk-plugin: b78b305590ffedda38455574a19fdd38
poll: 4af8698c5fcc1dc9a786b31ec8234171
styleguide: 0fd92e5ef0c99ee047f206961a587544