fix several diagramming issues

Author: dimitri-yatsenko

datajoint/dependencies.py

@@ -62,10 +62,10 @@ def load(self):
         # add edges to the graph
         for fk in fks.values():
             props = dict(
-                primary=all(attr in pks[fk['referencing_table']] for attr in fk['attr_map']),
+                primary=set(fk['attr_map']) <= set(pks[fk['referencing_table']]),
                 attr_map=fk['attr_map'],
                 aliased=any(k != v for k, v in fk['attr_map'].items()),
-                multi=not all(a in fk['attr_map'] for a in pks[fk['referencing_table']]))
+                multi=set(fk['attr_map']) != set(pks[fk['referencing_table']]))
             if not props['aliased']:
                 self.add_edge(fk['referenced_table'], fk['referencing_table'], **props)
             else:

datajoint/diagram.py

@@ -191,6 +191,8 @@ def __add__(self, arg):
                         new = nx.algorithms.boundary.node_boundary(self, self.nodes_to_show)
                         if not new:
                             break
+                        # add nodes referenced by aliased nodes
+                        new.update(nx.algorithms.boundary.node_boundary(self, (a for a in new if a.isdigit())))
                         self.nodes_to_show.update(new)
             return self
 
@@ -207,9 +209,12 @@ def __sub__(self, arg):
                     self.nodes_to_show.remove(arg.full_table_name)
                 except AttributeError:
                     for i in range(arg):
-                        new = nx.algorithms.boundary.node_boundary(nx.DiGraph(self).reverse(), self.nodes_to_show)
+                        graph = nx.DiGraph(self).reverse()
+                        new = nx.algorithms.boundary.node_boundary(graph, self.nodes_to_show)
                         if not new:
                             break
+                        # add nodes referenced by aliased nodes
+                        new.update(nx.algorithms.boundary.node_boundary(graph, (a for a in new if a.isdigit())))
                         self.nodes_to_show.update(new)
             return self
 
@@ -229,8 +234,10 @@ def _make_graph(self):
             """
             # mark "distinguished" tables, i.e. those that introduce new primary key attributes
             for name in self.nodes_to_show:
-                foreign_attributes = set(attr for p in self.in_edges(name, data=True) for attr in p[2]['attr_map'])
-                self.node[name]['distinguished'] = foreign_attributes < self.node[name]['primary_key']
+                foreign_attributes = set(
+                    attr for p in self.in_edges(name, data=True) for attr in p[2]['attr_map'] if p[2]['primary'])
+                self.node[name]['distinguished'] = (
+                        'primary_key' in self.node[name] and foreign_attributes < self.node[name]['primary_key'])
             # include aliased nodes that are sandwiched between two displayed nodes
             gaps = set(nx.algorithms.boundary.node_boundary(self, self.nodes_to_show)).intersection(
                 nx.algorithms.boundary.node_boundary(nx.DiGraph(self).reverse(), self.nodes_to_show))

datajoint/fetch.py

@@ -121,7 +121,6 @@ def __call__(self, *attrs, offset=None, limit=None, order_by=None, format=None,
         :param download_path: for fetches that download data, e.g. attachments
         :return: the contents of the relation in the form of a structured numpy.array or a dict list
         """
-
         if order_by is not None:
             # if 'order_by' passed in a string, make into list
             if isinstance(order_by, str):

tests/test_erd.py

@@ -43,7 +43,7 @@ def test_erd():
     def test_erd_algebra():
         erd0 = dj.ERD(B)
         erd1 = erd0 + 3
-        erd2 = dj.ERD(E) - 3
+        erd2 = dj.Di(E) - 3
         erd3 = erd1 * erd2
         erd4 = (erd0 + E).add_parts() - B - E
         assert_true(erd0.nodes_to_show == set(cls.full_table_name for cls in [B]))