A platform for community discussion. Free, open, simple.
MT: Fix crash on integer tag_group_id in generic bulk import
Gerhard Schlagera5af6ff855a7
diff --git a/script/bulk_import/generic_bulk.rb b/script/bulk_import/generic_bulk.rbindex 6864c1c4e2b..ecff4784044 100644--- a/script/bulk_import/generic_bulk.rb+++ b/script/bulk_import/generic_bulk.rb@@ -3977,7 +3977,7 @@ class BulkImport::Generic < BulkImport::Baseintermediate_group_ids = []if row["tag_group_ids"] && !row["tag_group_ids"].empty?intermediate_group_ids = JSON.parse(row["tag_group_ids"])- elsif row["tag_group_id"] && !row["tag_group_id"].empty?+ elsif row["tag_group_id"].present?# Support old single tag_group_idintermediate_group_ids = [row["tag_group_id"]]enddiff --git a/spec/script/bulk_import/generic_bulk_spec.rb b/spec/script/bulk_import/generic_bulk_spec.rbindex 3d1a2c61d4d..d6812a94da0 100644--- a/spec/script/bulk_import/generic_bulk_spec.rb+++ b/spec/script/bulk_import/generic_bulk_spec.rb@@ -594,6 +594,33 @@ if generic_import_dependencies_availableendend+ describe "#import_tags" do+ fab!(:tag_group)++ let(:source_db) { SQLite3::Database.new(":memory:", results_as_hash: true) }+ let(:importer) do+ described_class.allocate.tap do |instance|+ instance.instance_variable_set(:@source_db, source_db)+ instance.instance_variable_set(:@tag_group_mapping, { 7 => tag_group.id })+ end+ end++ after { source_db.close }++ it "adds tags to the group from the single tag_group_id column" do+ source_db.execute(<<~SQL)+ CREATE TABLE tags (+ id INTEGER, name TEXT, description TEXT, tag_group_ids TEXT, tag_group_id INTEGER+ )+ SQL+ source_db.execute("INSERT INTO tags (id, name, tag_group_id) VALUES (1, 'grouped', 7)")++ importer.import_tags++ expect(tag_group.reload.tags.pluck(:name)).to contain_exactly("grouped")+ end+ end+describe "mapping selection" dofab!(:canonical_user, :user)fab!(:other_user, :user)