allows empty table ID in data.Merge

rrgmc · Oct 17, 2023 · 5fdc642 · 5fdc642
1 parent 541e4f8
commit 5fdc642
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/table.go b/table.go
@@ -39,7 +39,11 @@ type Table struct {
 
 // Merge merges source into d. A deep copy is done to ensure source is never modified.
 func (t *Table) Merge(source *Table) error {
-	if source.ID != t.ID {
+	if source.ID != "" && t.ID == "" {
+		t.ID = source.ID
+	} else if source.ID == "" && t.ID != "" {
+		// do nothing, can't change source
+	} else if source.ID != t.ID {
 		return fmt.Errorf("table IDs don't match (%s - %s)", source.ID, t.ID)
 	}
 

diff --git a/table_test.go b/table_test.go
@@ -108,7 +108,7 @@ func TestDataMerge(t *testing.T) {
 	data2 := &Data{
 		Tables: map[string]*Table{
 			"tags": {
-				ID: "tags",
+				// ID: "tags", // if data already exists, not setting will keep previous value
 				Rows: Rows{
 					Row{Fields: map[string]any{"x": 3}},
 					Row{Fields: map[string]any{"x": 4}},