OWMergeData: Add missing ids for outer join

Author: janezd

Orange/widgets/data/owmergedata.py

@@ -305,8 +305,9 @@ def best_match(model, extra_model):
             if len(state) == 1 \
                     and not any(isinstance(v, Variable) for v in state[0]):
                 l_var, r_var = best_match(box.model_left, box.model_right)
-                self._try_set_combo(box.rows[0].left_combo, l_var)
-                self._try_set_combo(box.rows[0].right_combo, r_var)
+                if l_var is not None:
+                    self._try_set_combo(box.rows[0].left_combo, l_var)
+                    self._try_set_combo(box.rows[0].right_combo, r_var)
 
     @Inputs.data
     @check_sql_input
@@ -554,7 +555,12 @@ def _join_table_by_indices(self, reduced_extra, lefti, righti):
         table = Orange.data.Table.from_numpy(domain, X, Y, metas)
         table.name = getattr(self.data, 'name', '')
         table.attributes = getattr(self.data, 'attributes', {})
-        table.ids = self.data.ids
+        if self.merging == self.OuterJoin:
+            table.ids = np.hstack(
+                (self.data.ids,
+                 self.extra_data.ids[righti[len(self.data):]]))
+        else:
+            table.ids = self.data.ids[lefti]
         return table
 
     @staticmethod

Orange/widgets/data/tests/test_owmergedata.py

@@ -457,7 +457,9 @@ def test_output_merge_by_ids_outer(self):
         self.send_signal(self.widget.Inputs.extra_data, self.dataA[1:, [1, "cls", -2]])
         self.widget.attr_boxes.set_state([(INSTANCEID, INSTANCEID)])
         self.widget.controls.merging.buttons[self.widget.OuterJoin].click()
-        self.assertTablesEqual(self.get_output(self.widget.Outputs.data), result)
+        out = self.get_output(self.widget.Outputs.data)
+        self.assertTablesEqual(out, result)
+        np.testing.assert_equal(out.ids, [0, 1, 2, 3])
 
     def test_output_merge_by_index_left(self):
         """Check output for merging option 'Append columns from Extra Data' by