A platform for community discussion. Free, open, simple.
DEV: better multisite suppport for migrate gifs (#40792)
David Battersby9cad97efcbde
diff --git a/lib/tasks/migrate_discourse_gifs_to_core.rake b/lib/tasks/migrate_discourse_gifs_to_core.rakeindex 186076b08fd..a2c90534f35 100644--- a/lib/tasks/migrate_discourse_gifs_to_core.rake+++ b/lib/tasks/migrate_discourse_gifs_to_core.rake@@ -158,7 +158,28 @@ module DiscourseGifsMigrationputs " #{paint(text, color, bold: bold)}"end- def find_components+ def migrate_all(enable_gifs:)+ migrated_any = false++ each_target_db do |db|+ theme = find_component_in_db(db)+ next unless theme++ unless migrated_any+ puts "\nMigrating settings..."+ puts "---------------------"+ migrated_any = true+ end++ migrate_component(theme, enable_gifs: enable_gifs)+ end++ unless migrated_any+ puts "\nNo #{DiscourseGifs::COMPONENT_NAME} theme component found. Nothing to migrate."+ end+ end++ def each_target_dbif ENV["RAILS_DB"].present?db = ENV["RAILS_DB"]@@ -169,19 +190,14 @@ module DiscourseGifsMigrationdb = default_dbend- RailsMultisite::ConnectionManagement.establish_connection(db: db)- Array(find_component_in_db(db))+ RailsMultisite::ConnectionManagement.with_connection(db) { yield db }else- [].tap do |components|- RailsMultisite::ConnectionManagement.each_connection do |db|- components.concat(Array(find_component_in_db(db)))- end- end+ RailsMultisite::ConnectionManagement.each_connection { |db| yield db }endenddef find_component_in_db(db)- puts "Accessing database: #{db_label(db)}"+ puts "Accessing database: #{db_label(db)} (#{RailsMultisite::ConnectionManagement.current_hostname})"puts "Searching for #{DiscourseGifs::COMPONENT_NAME} theme component..."themes =@@ -211,14 +227,9 @@ module DiscourseGifsMigrationdef migrate_component(theme, enable_gifs:)puts "\n Migrating settings for #{paint("#{theme.name} (ID: #{theme.id})", bold: true)}..."- # Read the TC's *effective* settings — overrides AND schema defaults. A- # ThemeSetting row only exists once a value is changed from its default, so- # reading theme_settings alone would miss every untouched setting (e.g. the- # default provider and content rating) and silently fall back to core's- # defaults instead of preserving the site's actual behaviour.values =theme.settings.each_with_object({}) { |(name, setting), h| h[name.to_s] = setting.value }- provider = values["api_provider"].presence || "giphy"+ provider = values["api_provider"].presence || "giphy" # giphy is the default provider in theme componentputs " Detected provider: #{paint(provider, bold: true)}"mapping = (PROVIDER_MAPPINGS[provider] || {}).merge(SHARED_MAPPINGS)@@ -332,13 +343,5 @@ desc "Migrate #{DiscourseGifs::COMPONENT_NAME} theme component settings to coretask "themes:discourse_gifs:migrate" => :environment doenable_gifs = %w[true yes 1].include?(ENV["ENABLE_GIFS"].to_s.strip.downcase)- components = DiscourseGifsMigration.find_components-- if components.any?- puts "\nMigrating settings..."- puts "---------------------"- components.each { |c| DiscourseGifsMigration.migrate_component(c, enable_gifs: enable_gifs) }- else- puts "\nNo #{DiscourseGifs::COMPONENT_NAME} theme component found. Nothing to migrate."- end+ DiscourseGifsMigration.migrate_all(enable_gifs: enable_gifs)enddiff --git a/spec/tasks/migrate_discourse_gifs_to_core_multisite_spec.rb b/spec/tasks/migrate_discourse_gifs_to_core_multisite_spec.rbnew file mode 100644index 00000000000..0489bbb084e--- /dev/null+++ b/spec/tasks/migrate_discourse_gifs_to_core_multisite_spec.rb@@ -0,0 +1,17 @@+# frozen_string_literal: true++RSpec.describe "tasks/migrate_discourse_gifs_to_core (multisite)", type: :multisite do+ before { silence_warnings { Discourse::Application.load_tasks } }++ it "migrates each site's component while its own connection is active" do+ migrations = []+ allow(DiscourseGifsMigration).to receive(:find_component_in_db) { |db| db }+ allow(DiscourseGifsMigration).to receive(:migrate_component) do |db, **|+ migrations << [db, RailsMultisite::ConnectionManagement.current_db]+ end++ capture_stdout { DiscourseGifsMigration.migrate_all(enable_gifs: false) }++ expect(migrations).to contain_exactly(%w[default default], %w[second second])+ end+end