A platform for community discussion. Free, open, simple.
FIX: Preserve user locale data in generic bulk imports (#41957)
Ruben Oussoren9a96fc01efc9
diff --git a/script/bulk_import/base.rb b/script/bulk_import/base.rbindex 1b8b546274d..a906cfbcc76 100644--- a/script/bulk_import/base.rb+++ b/script/bulk_import/base.rb@@ -559,8 +559,10 @@ class BulkImport::Baseusernameusername_lowername+ localetitleactive+ stagedtrust_leveladminmoderator@@ -1388,6 +1390,7 @@ class BulkImport::Baseuser[:username_lower] = user[:username].downcaseuser[:trust_level] ||= TrustLevel[1]user[:active] = true unless user.has_key?(:active)+ user[:staged] = false if user[:staged].nil?user[:admin] ||= falseuser[:moderator] ||= falseuser[:last_emailed_at] ||= NOW@@ -1500,7 +1503,7 @@ class BulkImport::Base}def process_user_option(user_option)- if user_option.key?(:hide_profile_and_presence)+ if !user_option[:hide_profile_and_presence].nil?hide_profile_and_presence = user_option[:hide_profile_and_presence]user_option[:hide_profile] = user_option[:hide_presence] = hide_profile_and_presenceenddiff --git a/script/bulk_import/generic_bulk.rb b/script/bulk_import/generic_bulk.rbindex 3107afca5ff..9c36acef8bb 100644--- a/script/bulk_import/generic_bulk.rb+++ b/script/bulk_import/generic_bulk.rb@@ -598,8 +598,10 @@ class BulkImport::Generic < BulkImport::Baseoriginal_username: row["original_username"],name: row["name"],email: row["email"],+ locale: row["locale"],external_id: sso_record&.fetch("external_id", nil),created_at: to_datetime(row["created_at"]),+ staged: row["staged"],last_seen_at: to_datetime(row["last_seen_at"]),admin: row["admin"],moderator: row["moderator"],@@ -675,13 +677,24 @@ class BulkImport::Generic < BulkImport::Basedef import_user_optionsputs "", "Importing user options..."+ users_columns = table_column_names("users")+ hide_profile_columns = %w[hide_profile_and_presence hide_profile hide_presence]+ available_hide_profile_columns =+ hide_profile_columns.select { |column| users_columns.include?(column) }+ select_hide_profile_columns =+ hide_profile_columns.map do |column|+ available_hide_profile_columns.include?(column) ? column : "NULL AS #{column}"+ end+users = query(<<~SQL)- SELECT id, timezone, email_level, email_messages_level, email_digests+ SELECT id, timezone, email_level, email_messages_level, email_digests,+ #{select_hide_profile_columns.join(", ")}FROM usersWHERE timezone IS NOT NULLOR email_level IS NOT NULLOR email_messages_level IS NOT NULLOR email_digests IS NOT NULL+ #{available_hide_profile_columns.map { |column| "OR #{column} IS NOT NULL" }.join("\n ")}ORDER BY idSQL@@ -691,14 +704,19 @@ class BulkImport::Generic < BulkImport::Baseuser_id = user_id_from_imported_id(row["id"])next unless user_id && existing_user_ids.add?(user_id)- {+ options = {user_id: user_id,timezone: row["timezone"],email_level: row["email_level"],email_messages_level: row["email_messages_level"],email_digests: row["email_digests"],- hide_profile_and_presence: row["hide_profile_and_presence"],+ hide_profile: row["hide_profile"],+ hide_presence: row["hide_presence"],}+ options[:hide_profile_and_presence] = row["hide_profile_and_presence"] if !row[+ "hide_profile_and_presence"+ ].nil?+ optionsendusers.close@@ -3621,6 +3639,14 @@ class BulkImport::Generic < BulkImport::Baseendend+ def table_column_names(table_name, db: @source_db)+ @table_column_names ||= {}+ @table_column_names[[db.object_id, table_name]] ||= query(+ "PRAGMA table_info(#{table_name})",+ db:,+ ) { |rows| rows.map { |row| row["name"] }.to_set }+ end+def to_date(text)text.present? ? Date.parse(text) : nilend