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

FIX: duplicate_emails get overridden in new batch of import

This commit is contained in:
Vinoth Kannan 2018-06-19 00:21:48 +05:30
parent 7a1cefce78
commit 4ffa4a28b0
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
script/import_scripts/lithium.rb
View File

@ -104,6 +104,7 @@ class ImportScripts::Lithium < ImportScripts::Base
user_count = mysql_query("SELECT COUNT(*) count FROM users").first["count"] user_count = mysql_query("SELECT COUNT(*) count FROM users").first["count"]
avatar_files = Dir.entries(AVATAR_DIR) avatar_files = Dir.entries(AVATAR_DIR)
duplicate_emails = mysql_query("SELECT email_lower FROM users GROUP BY email_lower HAVING COUNT(email_lower) > 1").map { |e| [e["email_lower"], 0] }.to_h
batches(BATCH_SIZE) do |offset| batches(BATCH_SIZE) do |offset|
users = mysql_query <<-SQL users = mysql_query <<-SQL
@ -129,8 +130,6 @@ class ImportScripts::Lithium < ImportScripts::Base
ORDER BY user_id ORDER BY user_id
SQL SQL
duplicate_emails = mysql_query("SELECT email_lower FROM users GROUP BY email_lower HAVING COUNT(email_lower) > 1").map { |e| [e["email_lower"], 0] }.to_h
create_users(users, total: user_count, offset: offset) do |user| create_users(users, total: user_count, offset: offset) do |user|
user_id = user["id"] user_id = user["id"]
profile = profiles.select { |p| p["user_id"] == user_id } profile = profiles.select { |p| p["user_id"] == user_id }
@ -143,7 +142,7 @@ class ImportScripts::Lithium < ImportScripts::Base
email_lower = email.downcase email_lower = email.downcase
if duplicate_emails.key?(email_lower) if duplicate_emails.key?(email_lower)
duplicate_emails[email_lower] += 1 duplicate_emails[email_lower] += 1
email.sub!("@", "+#{duplicate_emails[email_lower]}@") email.sub!("@", "+#{duplicate_emails[email_lower]}@") if duplicate_emails[email_lower] > 1
end end
{ {