Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Failed to restore backups from versions without translation overrides 

Rails calls I18n.translate during initialization and by default translation overrides are used. Database migrations would fail if the system tried to migrate from an old version that didn't have the `translation_overrides` table with all its columns yet.

This makes restoring really old backups work again. Running `DISABLE_TRANSLATION_OVERRIDES=1 rake db:migrate` will allow you to upgrade such an old database as well.
This commit is contained in:
Gerhard Schlager 2020-03-12 18:43:27 +01:00
parent 3e34964c73
commit 8022e51179
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/initializers/100-i18n.rb
View File

@ -9,7 +9,7 @@ I18n.backend = I18n::Backend::DiscourseI18n.new
I18n.fallbacks = I18n::Backend::FallbackLocaleList.new I18n.fallbacks = I18n::Backend::FallbackLocaleList.new
I18n.config.missing_interpolation_argument_handler = proc { throw(:exception) } I18n.config.missing_interpolation_argument_handler = proc { throw(:exception) }
I18n.reload! I18n.reload!
I18n.init_accelerator! I18n.init_accelerator!(overrides_enabled: ENV['DISABLE_TRANSLATION_OVERRIDES'] != '1')
unless Rails.env.test? unless Rails.env.test?
MessageBus.subscribe("/i18n-flush") do MessageBus.subscribe("/i18n-flush") do

6
lib/backup_restore/database_restorer.rb
View File

@ -134,7 +134,11 @@ module BackupRestore
log "Migrating the database..." log "Migrating the database..."
log Discourse::Utils.execute_command( log Discourse::Utils.execute_command(
{ "SKIP_POST_DEPLOYMENT_MIGRATIONS" => "0", "SKIP_OPTIMIZE_ICONS" => "1" }, {
"SKIP_POST_DEPLOYMENT_MIGRATIONS" => "0",
"SKIP_OPTIMIZE_ICONS" => "1",
"DISABLE_TRANSLATION_OVERRIDES" => "1"
},
"rake db:migrate", "rake db:migrate",
failure_message: "Failed to migrate database.", failure_message: "Failed to migrate database.",
chdir: Rails.root chdir: Rails.root

4
lib/freedom_patches/translate_accelerator.rb
View File

@ -21,8 +21,8 @@ module I18n
LRU_CACHE_SIZE = 400 LRU_CACHE_SIZE = 400
def init_accelerator! def init_accelerator!(overrides_enabled: true)
@overrides_enabled = true @overrides_enabled = overrides_enabled
execute_reload execute_reload
end end

1
spec/lib/backup_restore/database_restorer_spec.rb
View File

@ -38,6 +38,7 @@ describe BackupRestore::DatabaseRestorer do
Discourse::Utils.expects(:execute_command).with do |env, command, options| Discourse::Utils.expects(:execute_command).with do |env, command, options|
env["SKIP_POST_DEPLOYMENT_MIGRATIONS"] == "0" && env["SKIP_POST_DEPLOYMENT_MIGRATIONS"] == "0" &&
env["SKIP_OPTIMIZE_ICONS"] == "1" && env["SKIP_OPTIMIZE_ICONS"] == "1" &&
env["DISABLE_TRANSLATION_OVERRIDES"] == "1" &&
command == "rake db:migrate" && command == "rake db:migrate" &&
options[:chdir] == Rails.root options[:chdir] == Rails.root
end.once end.once