From ab6ca784860be3981b85e05f12bd2c863bb4b7ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Guitaut?= Date: Mon, 9 May 2022 10:49:13 +0200 Subject: [PATCH] FIX: Use proper ActiveRecord method in import scripts `ActiveRecord::Base.connection_config` has been deprecated since Rails 6.1 and was completely removed from Rails 7. Instead we need to use `ActiveRecord::Base.connection_db_config.configuration_hash`. Import scripts were forgotten when we did the Rails 7 upgrade, this patch fixes them. --- script/bulk_import/base.rb | 2 +- script/bulk_import/discourse_merger.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/script/bulk_import/base.rb b/script/bulk_import/base.rb index aeab38775421e..abe7677526f08 100644 --- a/script/bulk_import/base.rb +++ b/script/bulk_import/base.rb @@ -74,7 +74,7 @@ class BulkImport::Base def initialize charset = ENV["DB_CHARSET"] || "utf8" - db = ActiveRecord::Base.connection_config + db = ActiveRecord::Base.connection_db_config.configuration_hash @encoder = PG::TextEncoder::CopyRow.new @raw_connection = PG.connect(dbname: db[:database], port: db[:port]) @uploader = ImportScripts::Uploader.new diff --git a/script/bulk_import/discourse_merger.rb b/script/bulk_import/discourse_merger.rb index e1ab58c83c377..dc555850b85f4 100644 --- a/script/bulk_import/discourse_merger.rb +++ b/script/bulk_import/discourse_merger.rb @@ -18,7 +18,7 @@ class BulkImport::DiscourseMerger < BulkImport::Base def initialize db_password = ENV["DB_PASS"] || 'import_password' - local_db = ActiveRecord::Base.connection_config + local_db = ActiveRecord::Base.connection_db_config.configuration_hash @raw_connection = PG.connect(dbname: local_db[:database], host: 'localhost', port: local_db[:port], user: 'postgres', password: db_password) @source_db_config = {