Fix #930 union join bug, Add test for union join.

CHANGELOG.md

@@ -5,6 +5,7 @@
 * Bugfix - Replace use of numpy aliases of built-in types with built-in type. (#938) PR #939
 * Bugfix - `ExternalTable.delete` should not remove row on error (#953) PR #956
 * Bugfix - Fix error handling of remove_object function in `s3.py` (#952) PR #955
+* Bugfix - Fix assertion error when performing a union into a join (#930) PR #967
 
 ### 0.13.2 -- May 7, 2021
 * Update `setuptools_certificate` dependency to new name `otumat`

datajoint/expression.py

@@ -266,9 +266,11 @@ def join(self, other, semantic_check=True, left=False):
             - join_attributes)
         # need subquery if any of the join attributes are derived
         need_subquery1 = (need_subquery1 or isinstance(self, Aggregation) or
-                          any(n in self.heading.new_attributes for n in join_attributes))
+                          any(n in self.heading.new_attributes for n in join_attributes)
+                          or isinstance(self, Union))
         need_subquery2 = (need_subquery2 or isinstance(other, Aggregation) or
-                          any(n in other.heading.new_attributes for n in join_attributes))
+                          any(n in other.heading.new_attributes for n in join_attributes)
+                          or isinstance(self, Union))
         if need_subquery1:
             self = self.make_subquery()
         if need_subquery2:

docs-parts/intro/Releases_lang1.rst

@@ -4,6 +4,7 @@
 * Bugfix - Replace use of numpy aliases of built-in types with built-in type. (#938) PR #939
 * Bugfix - `ExternalTable.delete` should not remove row on error (#953) PR #956
 * Bugfix - Fix error handling of remove_object function in `s3.py` (#952) PR #955
+* Bugfix - Fix assertion error when performing a union into a join (#930) PR #967
 
 0.13.2 -- May 7, 2021
 ----------------------

tests/test_aggr_regressions.py

@@ -93,6 +93,20 @@ class X(dj.Lookup):
     """
     contents = zip(range(10))
 
+@schema
+class TableA(dj.Manual):
+    definition = """
+    table_a: int
+    """
+
+
+@schema
+class TableB(dj.Manual):
+    definition = """
+    -> TableA
+    table_b: int
+    """
+
 
 def test_issue558_part1():
     q = (A-B).proj(id2='3')
@@ -103,3 +117,12 @@ def test_issue558_part2():
     d = dict(id=3, id2=5)
     assert_equal(len(X & d), len((X & d).proj(id2='3')))
 
+
+def test_union_join():
+    # https://github.com/datajoint/datajoint-python/issues/930
+    TableA.insert(zip([1, 2, 3, 4, 5, 6]))
+    TableB.insert([(1, 11), (2, 22), (3, 33), (4, 44)])
+    q1 = TableB & 'table_a < 3'
+    q2 = TableB & 'table_a > 3'
+
+    (q1 + q2) * TableA