Skip to content

A platform for community discussion. Free, open, simple.

Fix/bulk import merge import and poll fixes (#39830)

Ruben Oussoren1338f053127a
diff --git a/lib/tasks/import.rake b/lib/tasks/import.rake
index ed001cc73fe..e7abf431acd 100644
--- a/lib/tasks/import.rake
+++ b/lib/tasks/import.rake
@@ -296,6 +296,8 @@ def insert_automatic_group_users
Group::AUTO_GROUPS.each do |group_name, group_id|
user_condition =
case group_name
+ when :anonymous, :logged_in_users
+ next
when :everyone
"TRUE"
when :admins
diff --git a/script/bulk_import/base.rb b/script/bulk_import/base.rb
index 78ed1e089e4..a003a99ab48 100644
--- a/script/bulk_import/base.rb
+++ b/script/bulk_import/base.rb
@@ -238,12 +238,22 @@ class BulkImport::Base
def load_index(type)
map = {}
- @raw_connection.send_query(
- "SELECT original_id, discourse_id FROM migration_mappings WHERE type = #{type} AND original_id NOT LIKE '%:%'",
- )
- @raw_connection.set_single_row_mode
-
- @raw_connection.get_result.stream_each { |row| map[row["original_id"]] = row["discourse_id"] }
+ if @import_prefix
+ @raw_connection.send_query(
+ "SELECT original_id, discourse_id FROM migration_mappings WHERE type = #{type} AND original_id LIKE '#{@import_prefix}:%'",
+ )
+ @raw_connection.set_single_row_mode
+ prefix_length = @import_prefix.length + 1
+ @raw_connection.get_result.stream_each do |row|
+ map[row["original_id"][prefix_length..]] = row["discourse_id"]
+ end
+ else
+ @raw_connection.send_query(
+ "SELECT original_id, discourse_id FROM migration_mappings WHERE type = #{type} AND original_id NOT LIKE '%:%'",
+ )
+ @raw_connection.set_single_row_mode
+ @raw_connection.get_result.stream_each { |row| map[row["original_id"]] = row["discourse_id"] }
+ end
@raw_connection.get_result
diff --git a/script/bulk_import/generic_bulk.rb b/script/bulk_import/generic_bulk.rb
index ee3b0dae23f..5e898322294 100644
--- a/script/bulk_import/generic_bulk.rb
+++ b/script/bulk_import/generic_bulk.rb
@@ -1295,7 +1295,7 @@ class BulkImport::Generic < BulkImport::Base
original_id: row["id"],
post_id: post_id,
name: poll_name(row),
- closed_at: to_datetime(row["closed_at"]),
+ closed_at: to_datetime(row["close_at"]),
type: row["type"],
status: row["status"],
results: row["results"],
@@ -1361,7 +1361,7 @@ class BulkImport::Generic < BulkImport::Base
next unless poll_id
option_ids = row["option_ids"].split(",")
- option_ids.each { |option_id| next if poll_option_id_from_original_id(option_id).present? }
+ next if option_ids.all? { |oid| poll_option_id_from_original_id(oid).present? }
{
original_ids: option_ids,
@@ -3144,6 +3144,7 @@ class BulkImport::Generic < BulkImport::Base
channel_id = chat_channel_id_from_original_id(row["chat_channel_id"])
original_message_user_id = user_id_from_imported_id(row["original_message_user_id"])
+ next if chat_thread_id_from_original_id(row["id"]).present?
next if channel_id.blank? || original_message_user_id.blank?
# Messages aren't imported yet. Use a placeholder `original_message_id` for now.
@@ -3219,6 +3220,7 @@ class BulkImport::Generic < BulkImport::Base
channel_id = chat_channel_id_from_original_id(row["chat_channel_id"])
user_id = user_id_from_imported_id(row["user_id"])
+ next if chat_message_id_from_original_id(row["id"]).present?
next if channel_id.blank? || user_id.blank?
next if row["message"].blank? && row["upload_ids"].blank?