Merge pull request #1923 from yphillip/join-merge-bug-fix

Join merge bug fix (proposed solution for #1843)

tests/join-merge.vd

@@ -1,8 +1,8 @@
 sheet	col	row	longname	input	keystrokes	comment
-			open-file	tests/join-merge-1.jsonl	o	
 			open-file	tests/join-merge-2.jsonl	o	
-join-merge-2	colA		key-col		!	
+			open-file	tests/join-merge-1.jsonl	o	
 join-merge-1	colA		key-col		!	
-join-merge-2			join-sheets-top2	merge	&	
-join-merge-2+join-merge-1	colA		type-int		#	
-join-merge-2+join-merge-1	colA		sort-asc		[	
+join-merge-2	colA		key-col		!	
+join-merge-1			join-sheets-top2	merge	&	
+join-merge-1+join-merge-2	colA		type-int		#	
+join-merge-1+join-merge-2	colA		sort-asc		[	

visidata/features/join.py

@@ -74,7 +74,7 @@ def openJoin(sheet, others, jointype=''):
     'append': 'all rows from all sheets; columns from all sheets',
     'concat': 'all rows from all sheets; columns and type from first sheet',
     'extend': 'only rows from first sheet; type from first sheet; columns from all sheets',
-    'merge': 'merge differences from other sheets into first sheet',
+    'merge': 'merge differences from other sheets into first sheet (including new rows)',
 }.items()]
 
 def joinkey(sheet, row):
@@ -134,14 +134,14 @@ def recalc(self, sheet=None):
 
 class MergeColumn(Column):
     def calcValue(self, row):
-        for vs, c in self.cols.items():
+        for vs, c in reversed(list(self.cols.items())):
             if c:
                 v = c.getTypedValue(row[vs])
                 if v and not isinstance(v, TypedWrapper):
                     return v
 
     def putValue(self, row, value):
-        for vs, c in reversed(self.cols.items()):
+        for vs, c in reversed(list(self.cols.items())):
             c.setValue(row[vs], value)
 
     def isDiff(self, row, value):