From 4e09206061b2b8036b1b06b712da58cdcd308dc2 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Thu, 19 Jul 2018 11:07:15 -0400
Subject: [PATCH] FIX: set uploads sequence after copying uplaods in
 discourse_merger

---
 script/bulk_import/discourse_merger.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/script/bulk_import/discourse_merger.rb b/script/bulk_import/discourse_merger.rb
index b3d6972e1d8..ee37ee3e5b7 100644
--- a/script/bulk_import/discourse_merger.rb
+++ b/script/bulk_import/discourse_merger.rb
@@ -322,6 +322,9 @@ class BulkImport::DiscourseMerger < BulkImport::Base
         @raw_connection.put_copy_data(row.values)
       end
     end
+
+    @sequences[Upload.sequence_name] = last_id + 1
+
     puts ''
 
     copy_model(PostUpload)
@@ -681,7 +684,8 @@ class BulkImport::DiscourseMerger < BulkImport::Base
 
     @topics.each do |old_topic_id, new_topic_id|
       current += 1
-      puts "#{current} completed. #{update_count} rows updated." if current % 200 == 0
+      percent = (current * 100) / total
+      puts "#{current} (#{percent}\%) completed. #{update_count} rows updated." if current % 200 == 0
 
       if topic = Topic.find_by_id(new_topic_id)
         replace_arg = [