Skip to content

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

MT: Update topic view counts during generic bulk delta imports (#43149)

Ruben Oussorenc2438cb9fa05
diff --git a/script/bulk_import/generic_bulk.rb b/script/bulk_import/generic_bulk.rb
index c5e14d8895e..67ba5b0bd69 100644
--- a/script/bulk_import/generic_bulk.rb
+++ b/script/bulk_import/generic_bulk.rb
@@ -1910,6 +1910,7 @@ class BulkImport::Generic < BulkImport::Base
slug
user_id
category_id
+ views
closed
archived
pinned_at
@@ -1945,6 +1946,7 @@ class BulkImport::Generic < BulkImport::Base
if row["category_id"].present?
update[:category_id] = category_id_from_imported_id(row["category_id"])
end
+ update[:views] = row["views"] if source_columns.include?("views") && !row["views"].nil?
%i[archived pinned_globally].each do |column|
if source_columns.include?(column.to_s)
update[column] = to_nullable_boolean(row[column.to_s])
diff --git a/spec/script/bulk_import/generic_bulk_spec.rb b/spec/script/bulk_import/generic_bulk_spec.rb
index 2efd97dd2b5..0567a7c3fed 100644
--- a/spec/script/bulk_import/generic_bulk_spec.rb
+++ b/spec/script/bulk_import/generic_bulk_spec.rb
@@ -159,13 +159,25 @@ if generic_import_dependencies_available
end
describe "#update_delta_topics" do
- it "treats closed as close-only while retaining other delta updates" do
+ it "replaces non-NULL views, including zero, while treating closed as close-only" do
source_db = SQLite3::Database.new(":memory:", results_as_hash: true)
- source_db.execute("CREATE TABLE topics (id INTEGER PRIMARY KEY, closed INTEGER)")
- source_db.execute("INSERT INTO topics (id, closed) VALUES (10, 0), (20, 1)")
+ source_db.execute(
+ "CREATE TABLE topics (id INTEGER PRIMARY KEY, closed INTEGER, views INTEGER)",
+ )
+ source_db.execute(
+ "INSERT INTO topics (id, closed, views) VALUES " \
+ "(10, 0, 1223), (20, 1, 0), (30, NULL, NULL)",
+ )
importer = described_class.allocate
importer.instance_variable_set(:@source_db, source_db)
- importer.instance_variable_set(:@delta_update_mappings, topics: { 10 => 100, 20 => 200 })
+ importer.instance_variable_set(
+ :@delta_update_mappings,
+ topics: {
+ 10 => 100,
+ 20 => 200,
+ 30 => 300,
+ },
+ )
allow(importer).to receive(:update_records).and_return(updated_keys: [])
@@ -174,7 +186,33 @@ if generic_import_dependencies_available
expect(importer).to have_received(:update_records) do |updates, name, columns|
expect(name).to eq("topic")
expect(columns).to include(:closed)
- expect(updates).to contain_exactly({ id: 100 }, { id: 200, closed: true })
+ expect(columns).to include(:views)
+ expect(updates).to contain_exactly(
+ { id: 100, views: 1_223 },
+ { id: 200, closed: true, views: 0 },
+ { id: 300 },
+ )
+ end
+ ensure
+ source_db&.close
+ end
+
+ it "skips views when the intermediate database predates the column" do
+ source_db = SQLite3::Database.new(":memory:", results_as_hash: true)
+ source_db.execute("CREATE TABLE topics (id INTEGER PRIMARY KEY, closed INTEGER)")
+ source_db.execute("INSERT INTO topics (id, closed) VALUES (10, 1)")
+ importer = described_class.allocate
+ importer.instance_variable_set(:@source_db, source_db)
+ importer.instance_variable_set(:@delta_update_mappings, topics: { 10 => 100 })
+
+ allow(importer).to receive(:update_records).and_return(updated_keys: [])
+
+ importer.update_delta_topics
+
+ expect(importer).to have_received(:update_records) do |updates, name, columns|
+ expect(name).to eq("topic")
+ expect(columns).to include(:views)
+ expect(updates).to contain_exactly({ id: 100, closed: true })
end
ensure
source_db&.close