IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Use proper ActiveRecord method in import scripts

Browse Source 
`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.
This commit is contained in:
Loïc Guitaut 2022-05-09 10:49:13 +02:00 committed by Loïc Guitaut
parent c05dc01fe9
commit ab6ca78486
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
script/bulk_import/base.rb
View File

@ -74,7 +74,7 @@ class BulkImport::Base
def initialize def initialize
charset = ENV["DB_CHARSET"] || "utf8" charset = ENV["DB_CHARSET"] || "utf8"
db = ActiveRecord::Base.connection_config db = ActiveRecord::Base.connection_db_config.configuration_hash
@encoder = PG::TextEncoder::CopyRow.new @encoder = PG::TextEncoder::CopyRow.new
@raw_connection = PG.connect(dbname: db[:database], port: db[:port]) @raw_connection = PG.connect(dbname: db[:database], port: db[:port])
@uploader = ImportScripts::Uploader.new @uploader = ImportScripts::Uploader.new

2
script/bulk_import/discourse_merger.rb
View File

@ -18,7 +18,7 @@ class BulkImport::DiscourseMerger < BulkImport::Base
def initialize def initialize
db_password = ENV["DB_PASS"] || 'import_password' 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) @raw_connection = PG.connect(dbname: local_db[:database], host: 'localhost', port: local_db[:port], user: 'postgres', password: db_password)
@source_db_config = { @source_db_config = {