jupyter-duckdb 1.4.105__py3-none-any.whl → 1.4.106__py3-none-any.whl

duckdb_kernel/parser/elements/binary/And.py

@@ -8,7 +8,7 @@ class And(LogicOperator):
 
     @staticmethod
     def symbols() -> Tuple[str, ...]:
-        return '∧', 'and', 'and'
+        return '∧', 'and'
 
     @property
     def sql_symbol(self) -> str:

duckdb_kernel/parser/elements/binary/Cross.py

@@ -8,7 +8,7 @@ from ...util.RenamableColumnList import RenamableColumnList
 class Cross(RABinaryOperator):
     @staticmethod
     def symbols() -> Tuple[str, ...]:
-        return chr(215), 'x'
+        return chr(215), 'x', 'times'
 
     def to_sql(self, tables: Dict[str, Table]) -> Tuple[str, RenamableColumnList]:
         # execute subqueries

duckdb_kernel/parser/elements/binary/LeftSemiJoin.py

@@ -0,0 +1,24 @@
+from typing import Tuple, Dict
+
+from duckdb_kernel.db import Table
+from ..RABinaryOperator import RABinaryOperator
+from ...util.RenamableColumnList import RenamableColumnList
+
+
+class LeftSemiJoin(RABinaryOperator):
+    @staticmethod
+    def symbols() -> Tuple[str, ...]:
+        return chr(8905), 'lsjoin'
+
+    def to_sql(self, tables: Dict[str, Table]) -> Tuple[str, RenamableColumnList]:
+        # execute subqueries
+        lq, lcols = self.left.to_sql(tables)
+        rq, rcols = self.right.to_sql(tables)
+
+        # find matching columns
+        join_cols, all_cols = lcols.intersect(rcols)
+
+        on_clause = ' AND '.join(f'{l.current_name} = {r.current_name}' for l, r in join_cols)
+
+        # create sql
+        return f'SELECT {lcols.list} FROM ({lq}) {self._name()} JOIN ({rq}) {self._name()} ON {on_clause}', lcols

duckdb_kernel/parser/elements/binary/RightSemiJoin.py

@@ -0,0 +1,24 @@
+from typing import Tuple, Dict
+
+from duckdb_kernel.db import Table
+from ..RABinaryOperator import RABinaryOperator
+from ...util.RenamableColumnList import RenamableColumnList
+
+
+class RightSemiJoin(RABinaryOperator):
+    @staticmethod
+    def symbols() -> Tuple[str, ...]:
+        return chr(8906), 'rsjoin'
+
+    def to_sql(self, tables: Dict[str, Table]) -> Tuple[str, RenamableColumnList]:
+        # execute subqueries
+        lq, lcols = self.left.to_sql(tables)
+        rq, rcols = self.right.to_sql(tables)
+
+        # find matching columns
+        join_cols, all_cols = lcols.intersect(rcols, prefer_right=True)
+
+        on_clause = ' AND '.join(f'{l.current_name} = {r.current_name}' for l, r in join_cols)
+
+        # create sql
+        return f'SELECT {rcols.list} FROM ({lq}) {self._name()} JOIN ({rq}) {self._name()} ON {on_clause}', rcols

duckdb_kernel/parser/elements/binary/__init__.py

@@ -3,7 +3,9 @@ from .Difference import Difference
 from .Intersection import Intersection
 from .Join import Join
 from .LeftOuterJoin import LeftOuterJoin
+from .LeftSemiJoin import LeftSemiJoin
 from .RightOuterJoin import RightOuterJoin
+from .RightSemiJoin import RightSemiJoin
 from .FullOuterJoin import FullOuterJoin
 from .Union import Union
 
@@ -37,7 +39,7 @@ RA_BINARY_OPERATORS = [
     [Union],
     [Intersection],
     [Join],
-    [LeftOuterJoin, RightOuterJoin, FullOuterJoin],
+    [LeftOuterJoin, RightOuterJoin, FullOuterJoin, LeftSemiJoin, RightSemiJoin],
     [Cross],
     [Division]
 ]

duckdb_kernel/tests/test_ra.py

@@ -105,6 +105,7 @@ def test_comments():
 def test_binary_operator_cross():
     for query in (
             r'Shows x Seasons',
+            r'Shows times Seasons',
     ):
         root = RAParser.parse_query(query)
 
@@ -315,6 +316,52 @@ def test_binary_operator_fjoin():
             ]
 
 
+def test_binary_operator_lsjoin():
+    for query in (
+            r'Users ⋉ BannedUsers',
+            r'Users lsjoin BannedUsers'
+    ):
+        root = RAParser.parse_query(query)
+
+        assert isinstance(root, BinaryOperators.LeftSemiJoin)
+        assert isinstance(root.left, RAOperand) and root.left.name == 'Users'
+        assert isinstance(root.right, RAOperand) and root.right.name == 'BannedUsers'
+
+        with Connection() as con:
+            cols, rows = con.execute_ra_return_cols(root)
+
+            assert [c.lower() for c in cols] == [
+                'id',
+                'username'
+            ]
+            assert rows == [
+                (2, 'Bob')
+            ]
+
+
+def test_binary_operator_rsjoin():
+    for query in (
+            r'Users ⋊ BannedUsers',
+            r'Users rsjoin BannedUsers'
+    ):
+        root = RAParser.parse_query(query)
+
+        assert isinstance(root, BinaryOperators.RightSemiJoin)
+        assert isinstance(root.left, RAOperand) and root.left.name == 'Users'
+        assert isinstance(root.right, RAOperand) and root.right.name == 'BannedUsers'
+
+        with Connection() as con:
+            cols, rows = con.execute_ra_return_cols(root)
+
+            assert [c.lower() for c in cols] == [
+                'id',
+                'bannedusername'
+            ]
+            assert rows == [
+                (2, 'Bob')
+            ]
+
+
 def test_binary_operator_union():
     for query in (
             r'Users ∪ BannedUsers',
@@ -589,7 +636,7 @@ def test_binary_left_to_right_evaluation_order():
     assert root.right.name == 'c'
 
     # outer join
-    root = RAParser.parse_query(r'a ⟕ b ⟕ c')
+    root = RAParser.parse_query(r'a ⟕ b ⟕ c')  # left outer, left outer
     assert isinstance(root, BinaryOperators.LeftOuterJoin)
     assert isinstance(root.left, BinaryOperators.LeftOuterJoin)
     assert isinstance(root.left.left, RAOperand)
@@ -599,7 +646,7 @@ def test_binary_left_to_right_evaluation_order():
     assert isinstance(root.right, RAOperand)
     assert root.right.name == 'c'
 
-    root = RAParser.parse_query(r'a ⟖ b ⟖ c')
+    root = RAParser.parse_query(r'a ⟖ b ⟖ c')  # right outer, right outer
     assert isinstance(root, BinaryOperators.RightOuterJoin)
     assert isinstance(root.left, BinaryOperators.RightOuterJoin)
     assert isinstance(root.left.left, RAOperand)
@@ -609,7 +656,7 @@ def test_binary_left_to_right_evaluation_order():
     assert isinstance(root.right, RAOperand)
     assert root.right.name == 'c'
 
-    root = RAParser.parse_query(r'a ⟗ b ⟗ c')
+    root = RAParser.parse_query(r'a ⟗ b ⟗ c')  # full outer, full outer
     assert isinstance(root, BinaryOperators.FullOuterJoin)
     assert isinstance(root.left, BinaryOperators.FullOuterJoin)
     assert isinstance(root.left.left, RAOperand)
@@ -619,8 +666,29 @@ def test_binary_left_to_right_evaluation_order():
     assert isinstance(root.right, RAOperand)
     assert root.right.name == 'c'
 
-    # mixed outer joins
-    root = RAParser.parse_query(r'a ⟕ b ⟖ c')
+    # semi join
+    root = RAParser.parse_query(r'a ⋉ b ⋉ c')  # left semi, left semi
+    assert isinstance(root, BinaryOperators.LeftSemiJoin)
+    assert isinstance(root.left, BinaryOperators.LeftSemiJoin)
+    assert isinstance(root.left.left, RAOperand)
+    assert root.left.left.name == 'a'
+    assert isinstance(root.left.right, RAOperand)
+    assert root.left.right.name == 'b'
+    assert isinstance(root.right, RAOperand)
+    assert root.right.name == 'c'
+
+    root = RAParser.parse_query(r'a ⋊ b ⋊ c')  # right semi, right semi
+    assert isinstance(root, BinaryOperators.RightSemiJoin)
+    assert isinstance(root.left, BinaryOperators.RightSemiJoin)
+    assert isinstance(root.left.left, RAOperand)
+    assert root.left.left.name == 'a'
+    assert isinstance(root.left.right, RAOperand)
+    assert root.left.right.name == 'b'
+    assert isinstance(root.right, RAOperand)
+    assert root.right.name == 'c'
+
+    # mixed outer and semi joins
+    root = RAParser.parse_query(r'a ⟕ b ⟖ c')  # left outer, right outer
     assert isinstance(root, BinaryOperators.RightOuterJoin)
     assert isinstance(root.left, BinaryOperators.LeftOuterJoin)
     assert isinstance(root.left.left, RAOperand)
@@ -630,7 +698,7 @@ def test_binary_left_to_right_evaluation_order():
     assert isinstance(root.right, RAOperand)
     assert root.right.name == 'c'
 
-    root = RAParser.parse_query(r'a ⟕ b ⟗ c')
+    root = RAParser.parse_query(r'a ⟕ b ⟗ c')  # left outer, full outer
     assert isinstance(root, BinaryOperators.FullOuterJoin)
     assert isinstance(root.left, BinaryOperators.LeftOuterJoin)
     assert isinstance(root.left.left, RAOperand)
@@ -640,7 +708,27 @@ def test_binary_left_to_right_evaluation_order():
     assert isinstance(root.right, RAOperand)
     assert root.right.name == 'c'
 
-    root = RAParser.parse_query(r'a ⟖ b ⟕ c')
+    root = RAParser.parse_query(r'a ⟕ b ⋉ c')  # left outer, left semi
+    assert isinstance(root, BinaryOperators.LeftSemiJoin)
+    assert isinstance(root.left, BinaryOperators.LeftOuterJoin)
+    assert isinstance(root.left.left, RAOperand)
+    assert root.left.left.name == 'a'
+    assert isinstance(root.left.right, RAOperand)
+    assert root.left.right.name == 'b'
+    assert isinstance(root.right, RAOperand)
+    assert root.right.name == 'c'
+
+    root = RAParser.parse_query(r'a ⟕ b ⋊ c')  # left outer, right semi
+    assert isinstance(root, BinaryOperators.RightSemiJoin)
+    assert isinstance(root.left, BinaryOperators.LeftOuterJoin)
+    assert isinstance(root.left.left, RAOperand)
+    assert root.left.left.name == 'a'
+    assert isinstance(root.left.right, RAOperand)
+    assert root.left.right.name == 'b'
+    assert isinstance(root.right, RAOperand)
+    assert root.right.name == 'c'
+
+    root = RAParser.parse_query(r'a ⟖ b ⟕ c')  # right outer, left outer
     assert isinstance(root, BinaryOperators.LeftOuterJoin)
     assert isinstance(root.left, BinaryOperators.RightOuterJoin)
     assert isinstance(root.left.left, RAOperand)
@@ -650,7 +738,7 @@ def test_binary_left_to_right_evaluation_order():
     assert isinstance(root.right, RAOperand)
     assert root.right.name == 'c'
 
-    root = RAParser.parse_query(r'a ⟖ b ⟗ c')
+    root = RAParser.parse_query(r'a ⟖ b ⟗ c')  # right outer, full outer
     assert isinstance(root, BinaryOperators.FullOuterJoin)
     assert isinstance(root.left, BinaryOperators.RightOuterJoin)
     assert isinstance(root.left.left, RAOperand)
@@ -660,7 +748,27 @@ def test_binary_left_to_right_evaluation_order():
     assert isinstance(root.right, RAOperand)
     assert root.right.name == 'c'
 
-    root = RAParser.parse_query(r'a ⟗ b ⟕ c')
+    root = RAParser.parse_query(r'a ⟖ b ⋉ c')  # right outer, left semi
+    assert isinstance(root, BinaryOperators.LeftSemiJoin)
+    assert isinstance(root.left, BinaryOperators.RightOuterJoin)
+    assert isinstance(root.left.left, RAOperand)
+    assert root.left.left.name == 'a'
+    assert isinstance(root.left.right, RAOperand)
+    assert root.left.right.name == 'b'
+    assert isinstance(root.right, RAOperand)
+    assert root.right.name == 'c'
+
+    root = RAParser.parse_query(r'a ⟖ b ⋊ c')  # right outer, right semi
+    assert isinstance(root, BinaryOperators.RightSemiJoin)
+    assert isinstance(root.left, BinaryOperators.RightOuterJoin)
+    assert isinstance(root.left.left, RAOperand)
+    assert root.left.left.name == 'a'
+    assert isinstance(root.left.right, RAOperand)
+    assert root.left.right.name == 'b'
+    assert isinstance(root.right, RAOperand)
+    assert root.right.name == 'c'
+
+    root = RAParser.parse_query(r'a ⟗ b ⟕ c')  # full outer, left outer
     assert isinstance(root, BinaryOperators.LeftOuterJoin)
     assert isinstance(root.left, BinaryOperators.FullOuterJoin)
     assert isinstance(root.left.left, RAOperand)
@@ -670,7 +778,7 @@ def test_binary_left_to_right_evaluation_order():
     assert isinstance(root.right, RAOperand)
     assert root.right.name == 'c'
 
-    root = RAParser.parse_query(r'a ⟗ b ⟖ c')
+    root = RAParser.parse_query(r'a ⟗ b ⟖ c')  # full outer, right outer
     assert isinstance(root, BinaryOperators.RightOuterJoin)
     assert isinstance(root.left, BinaryOperators.FullOuterJoin)
     assert isinstance(root.left.left, RAOperand)
@@ -680,6 +788,106 @@ def test_binary_left_to_right_evaluation_order():
     assert isinstance(root.right, RAOperand)
     assert root.right.name == 'c'
 
+    root = RAParser.parse_query(r'a ⟗ b ⋉ c')  # full outer, left semi
+    assert isinstance(root, BinaryOperators.LeftSemiJoin)
+    assert isinstance(root.left, BinaryOperators.FullOuterJoin)
+    assert isinstance(root.left.left, RAOperand)
+    assert root.left.left.name == 'a'
+    assert isinstance(root.left.right, RAOperand)
+    assert root.left.right.name == 'b'
+    assert isinstance(root.right, RAOperand)
+    assert root.right.name == 'c'
+
+    root = RAParser.parse_query(r'a ⟗ b ⋊ c')  # full outer, right semi
+    assert isinstance(root, BinaryOperators.RightSemiJoin)
+    assert isinstance(root.left, BinaryOperators.FullOuterJoin)
+    assert isinstance(root.left.left, RAOperand)
+    assert root.left.left.name == 'a'
+    assert isinstance(root.left.right, RAOperand)
+    assert root.left.right.name == 'b'
+    assert isinstance(root.right, RAOperand)
+    assert root.right.name == 'c'
+
+    root = RAParser.parse_query(r'a ⋉ b ⟕ c')  # left semi, left outer
+    assert isinstance(root, BinaryOperators.LeftOuterJoin)
+    assert isinstance(root.left, BinaryOperators.LeftSemiJoin)
+    assert isinstance(root.left.left, RAOperand)
+    assert root.left.left.name == 'a'
+    assert isinstance(root.left.right, RAOperand)
+    assert root.left.right.name == 'b'
+    assert isinstance(root.right, RAOperand)
+    assert root.right.name == 'c'
+
+    root = RAParser.parse_query(r'a ⋉ b ⟖ c')  # left semi, right outer
+    assert isinstance(root, BinaryOperators.RightOuterJoin)
+    assert isinstance(root.left, BinaryOperators.LeftSemiJoin)
+    assert isinstance(root.left.left, RAOperand)
+    assert root.left.left.name == 'a'
+    assert isinstance(root.left.right, RAOperand)
+    assert root.left.right.name == 'b'
+    assert isinstance(root.right, RAOperand)
+    assert root.right.name == 'c'
+
+    root = RAParser.parse_query(r'a ⋉ b ⟗ c')  # left semi, full outer
+    assert isinstance(root, BinaryOperators.FullOuterJoin)
+    assert isinstance(root.left, BinaryOperators.LeftSemiJoin)
+    assert isinstance(root.left.left, RAOperand)
+    assert root.left.left.name == 'a'
+    assert isinstance(root.left.right, RAOperand)
+    assert root.left.right.name == 'b'
+    assert isinstance(root.right, RAOperand)
+    assert root.right.name == 'c'
+
+    root = RAParser.parse_query(r'a ⋉ b ⋊ c')  # left semi, right semi
+    assert isinstance(root, BinaryOperators.RightSemiJoin)
+    assert isinstance(root.left, BinaryOperators.LeftSemiJoin)
+    assert isinstance(root.left.left, RAOperand)
+    assert root.left.left.name == 'a'
+    assert isinstance(root.left.right, RAOperand)
+    assert root.left.right.name == 'b'
+    assert isinstance(root.right, RAOperand)
+    assert root.right.name == 'c'
+
+    root = RAParser.parse_query(r'a ⋊ b ⟕ c')  # right semi, left outer
+    assert isinstance(root, BinaryOperators.LeftOuterJoin)
+    assert isinstance(root.left, BinaryOperators.RightSemiJoin)
+    assert isinstance(root.left.left, RAOperand)
+    assert root.left.left.name == 'a'
+    assert isinstance(root.left.right, RAOperand)
+    assert root.left.right.name == 'b'
+    assert isinstance(root.right, RAOperand)
+    assert root.right.name == 'c'
+
+    root = RAParser.parse_query(r'a ⋊ b ⟖ c')  # right semi, right outer
+    assert isinstance(root, BinaryOperators.RightOuterJoin)
+    assert isinstance(root.left, BinaryOperators.RightSemiJoin)
+    assert isinstance(root.left.left, RAOperand)
+    assert root.left.left.name == 'a'
+    assert isinstance(root.left.right, RAOperand)
+    assert root.left.right.name == 'b'
+    assert isinstance(root.right, RAOperand)
+    assert root.right.name == 'c'
+
+    root = RAParser.parse_query(r'a ⋊ b ⟗ c')  # right semi, full outer
+    assert isinstance(root, BinaryOperators.FullOuterJoin)
+    assert isinstance(root.left, BinaryOperators.RightSemiJoin)
+    assert isinstance(root.left.left, RAOperand)
+    assert root.left.left.name == 'a'
+    assert isinstance(root.left.right, RAOperand)
+    assert root.left.right.name == 'b'
+    assert isinstance(root.right, RAOperand)
+    assert root.right.name == 'c'
+
+    root = RAParser.parse_query(r'a ⋊ b ⋉ c')  # right semi, left semi
+    assert isinstance(root, BinaryOperators.LeftSemiJoin)
+    assert isinstance(root.left, BinaryOperators.RightSemiJoin)
+    assert isinstance(root.left.left, RAOperand)
+    assert root.left.left.name == 'a'
+    assert isinstance(root.left.right, RAOperand)
+    assert root.left.right.name == 'b'
+    assert isinstance(root.right, RAOperand)
+    assert root.right.name == 'c'
+
     # cross join
     root = RAParser.parse_query(r'a x b x c')
     assert isinstance(root, BinaryOperators.Cross)
@@ -770,6 +978,22 @@ def test_binary_evaluation_order():
     assert isinstance(root, BinaryOperators.Difference)
     assert isinstance(root.right, RAOperand) and isinstance(root.left, BinaryOperators.FullOuterJoin)
 
+    root = RAParser.parse_query(r'a \ b ⋉ c')
+    assert isinstance(root, BinaryOperators.Difference)
+    assert isinstance(root.left, RAOperand) and isinstance(root.right, BinaryOperators.LeftSemiJoin)
+
+    root = RAParser.parse_query(r'a ⋉ b \ c')
+    assert isinstance(root, BinaryOperators.Difference)
+    assert isinstance(root.right, RAOperand) and isinstance(root.left, BinaryOperators.LeftSemiJoin)
+
+    root = RAParser.parse_query(r'a \ b ⋊ c')
+    assert isinstance(root, BinaryOperators.Difference)
+    assert isinstance(root.left, RAOperand) and isinstance(root.right, BinaryOperators.RightSemiJoin)
+
+    root = RAParser.parse_query(r'a ⋊ b \ c')
+    assert isinstance(root, BinaryOperators.Difference)
+    assert isinstance(root.right, RAOperand) and isinstance(root.left, BinaryOperators.RightSemiJoin)
+
     # difference <-> cross
     root = RAParser.parse_query(r'a \ b x c')
     assert isinstance(root, BinaryOperators.Difference)
@@ -830,6 +1054,22 @@ def test_binary_evaluation_order():
     assert isinstance(root, BinaryOperators.Union)
     assert isinstance(root.right, RAOperand) and isinstance(root.left, BinaryOperators.FullOuterJoin)
 
+    root = RAParser.parse_query(r'a ∪ b ⋉ c')
+    assert isinstance(root, BinaryOperators.Union)
+    assert isinstance(root.left, RAOperand) and isinstance(root.right, BinaryOperators.LeftSemiJoin)
+
+    root = RAParser.parse_query(r'a ⋉ b ∪ c')
+    assert isinstance(root, BinaryOperators.Union)
+    assert isinstance(root.right, RAOperand) and isinstance(root.left, BinaryOperators.LeftSemiJoin)
+
+    root = RAParser.parse_query(r'a ∪ b ⋊ c')
+    assert isinstance(root, BinaryOperators.Union)
+    assert isinstance(root.left, RAOperand) and isinstance(root.right, BinaryOperators.RightSemiJoin)
+
+    root = RAParser.parse_query(r'a ⋊ b ∪ c')
+    assert isinstance(root, BinaryOperators.Union)
+    assert isinstance(root.right, RAOperand) and isinstance(root.left, BinaryOperators.RightSemiJoin)
+
     # union <-> cross
     root = RAParser.parse_query(r'a ∪ b x c')
     assert isinstance(root, BinaryOperators.Union)
@@ -881,6 +1121,22 @@ def test_binary_evaluation_order():
     assert isinstance(root, BinaryOperators.Intersection)
     assert isinstance(root.right, RAOperand) and isinstance(root.left, BinaryOperators.FullOuterJoin)
 
+    root = RAParser.parse_query(r'a ∩ b ⋉ c')
+    assert isinstance(root, BinaryOperators.Intersection)
+    assert isinstance(root.left, RAOperand) and isinstance(root.right, BinaryOperators.LeftSemiJoin)
+
+    root = RAParser.parse_query(r'a ⋉ b ∩ c')
+    assert isinstance(root, BinaryOperators.Intersection)
+    assert isinstance(root.right, RAOperand) and isinstance(root.left, BinaryOperators.LeftSemiJoin)
+
+    root = RAParser.parse_query(r'a ∩ b ⋊ c')
+    assert isinstance(root, BinaryOperators.Intersection)
+    assert isinstance(root.left, RAOperand) and isinstance(root.right, BinaryOperators.RightSemiJoin)
+
+    root = RAParser.parse_query(r'a ⋊ b ∩ c')
+    assert isinstance(root, BinaryOperators.Intersection)
+    assert isinstance(root.right, RAOperand) and isinstance(root.left, BinaryOperators.RightSemiJoin)
+
     # intersection <-> cross
     root = RAParser.parse_query(r'a ∩ b x c')
     assert isinstance(root, BinaryOperators.Intersection)
@@ -932,6 +1188,22 @@ def test_binary_evaluation_order():
     assert isinstance(root, BinaryOperators.FullOuterJoin)
     assert isinstance(root.right, RAOperand) and isinstance(root.left, BinaryOperators.Cross)
 
+    root = RAParser.parse_query(r'a ⋉ b x c')
+    assert isinstance(root, BinaryOperators.LeftSemiJoin)
+    assert isinstance(root.left, RAOperand) and isinstance(root.right, BinaryOperators.Cross)
+
+    root = RAParser.parse_query(r'a x b ⋉ c')
+    assert isinstance(root, BinaryOperators.LeftSemiJoin)
+    assert isinstance(root.right, RAOperand) and isinstance(root.left, BinaryOperators.Cross)
+
+    root = RAParser.parse_query(r'a ⋊ b x c')
+    assert isinstance(root, BinaryOperators.RightSemiJoin)
+    assert isinstance(root.left, RAOperand) and isinstance(root.right, BinaryOperators.Cross)
+
+    root = RAParser.parse_query(r'a x b ⋊ c')
+    assert isinstance(root, BinaryOperators.RightSemiJoin)
+    assert isinstance(root.right, RAOperand) and isinstance(root.left, BinaryOperators.Cross)
+
     # join <-> division
     root = RAParser.parse_query(r'a ⋈ b ÷ c')
     assert isinstance(root, BinaryOperators.Join)
@@ -965,6 +1237,22 @@ def test_binary_evaluation_order():
     assert isinstance(root, BinaryOperators.FullOuterJoin)
     assert isinstance(root.right, RAOperand) and isinstance(root.left, BinaryOperators.Division)
 
+    root = RAParser.parse_query(r'a ⋉ b ÷ c')
+    assert isinstance(root, BinaryOperators.LeftSemiJoin)
+    assert isinstance(root.left, RAOperand) and isinstance(root.right, BinaryOperators.Division)
+
+    root = RAParser.parse_query(r'a ÷ b ⋉ c')
+    assert isinstance(root, BinaryOperators.LeftSemiJoin)
+    assert isinstance(root.right, RAOperand) and isinstance(root.left, BinaryOperators.Division)
+
+    root = RAParser.parse_query(r'a ⋊ b ÷ c')
+    assert isinstance(root, BinaryOperators.RightSemiJoin)
+    assert isinstance(root.left, RAOperand) and isinstance(root.right, BinaryOperators.Division)
+
+    root = RAParser.parse_query(r'a ÷ b ⋊ c')
+    assert isinstance(root, BinaryOperators.RightSemiJoin)
+    assert isinstance(root.right, RAOperand) and isinstance(root.left, BinaryOperators.Division)
+
     # natural join <-> outer join
     root = RAParser.parse_query(r'a ⋈ b ⟕ c')
     assert isinstance(root, BinaryOperators.Join)
@@ -990,6 +1278,22 @@ def test_binary_evaluation_order():
     assert isinstance(root, BinaryOperators.Join)
     assert isinstance(root.right, RAOperand) and isinstance(root.left, BinaryOperators.FullOuterJoin)
 
+    root = RAParser.parse_query(r'a ⋈ b ⋉ c')
+    assert isinstance(root, BinaryOperators.Join)
+    assert isinstance(root.left, RAOperand) and isinstance(root.right, BinaryOperators.LeftSemiJoin)
+
+    root = RAParser.parse_query(r'a ⋉ b ⋈ c')
+    assert isinstance(root, BinaryOperators.Join)
+    assert isinstance(root.right, RAOperand) and isinstance(root.left, BinaryOperators.LeftSemiJoin)
+
+    root = RAParser.parse_query(r'a ⋈ b ⋊ c')
+    assert isinstance(root, BinaryOperators.Join)
+    assert isinstance(root.left, RAOperand) and isinstance(root.right, BinaryOperators.RightSemiJoin)
+
+    root = RAParser.parse_query(r'a ⋊ b ⋈ c')
+    assert isinstance(root, BinaryOperators.Join)
+    assert isinstance(root.right, RAOperand) and isinstance(root.left, BinaryOperators.RightSemiJoin)
+
     # cross <-> division
     root = RAParser.parse_query(r'a x b ÷ c')
     assert isinstance(root, BinaryOperators.Cross)
@@ -1115,6 +1419,22 @@ def test_mixed_evaluation_order():
     assert isinstance(root, BinaryOperators.FullOuterJoin)
     assert isinstance(root.right, RAOperand) and isinstance(root.left, UnaryOperators.Projection)
 
+    root = RAParser.parse_query(r'a ⋉ π [ Id ] b')
+    assert isinstance(root, BinaryOperators.LeftSemiJoin)
+    assert isinstance(root.left, RAOperand) and isinstance(root.right, UnaryOperators.Projection)
+
+    root = RAParser.parse_query(r'π [ Id ] a ⋉ b')
+    assert isinstance(root, BinaryOperators.LeftSemiJoin)
+    assert isinstance(root.right, RAOperand) and isinstance(root.left, UnaryOperators.Projection)
+
+    root = RAParser.parse_query(r'a ⋊ π [ Id ] b')
+    assert isinstance(root, BinaryOperators.RightSemiJoin)
+    assert isinstance(root.left, RAOperand) and isinstance(root.right, UnaryOperators.Projection)
+
+    root = RAParser.parse_query(r'π [ Id ] a ⋊ b')
+    assert isinstance(root, BinaryOperators.RightSemiJoin)
+    assert isinstance(root.right, RAOperand) and isinstance(root.left, UnaryOperators.Projection)
+
     # join <-> rename
     root = RAParser.parse_query(r'a ⋈ β [ Id2 ← Id ] b')
     assert isinstance(root, BinaryOperators.Join)
@@ -1148,6 +1468,22 @@ def test_mixed_evaluation_order():
     assert isinstance(root, BinaryOperators.FullOuterJoin)
     assert isinstance(root.right, RAOperand) and isinstance(root.left, UnaryOperators.Rename)
 
+    root = RAParser.parse_query(r'a ⋉ β [ Id2 ← Id ] b')
+    assert isinstance(root, BinaryOperators.LeftSemiJoin)
+    assert isinstance(root.left, RAOperand) and isinstance(root.right, UnaryOperators.Rename)
+
+    root = RAParser.parse_query(r'β [ Id2 ← Id ] a ⋉ b')
+    assert isinstance(root, BinaryOperators.LeftSemiJoin)
+    assert isinstance(root.right, RAOperand) and isinstance(root.left, UnaryOperators.Rename)
+
+    root = RAParser.parse_query(r'a ⋊ β [ Id2 ← Id ] b')
+    assert isinstance(root, BinaryOperators.RightSemiJoin)
+    assert isinstance(root.left, RAOperand) and isinstance(root.right, UnaryOperators.Rename)
+
+    root = RAParser.parse_query(r'β [ Id2 ← Id ] a ⋊ b')
+    assert isinstance(root, BinaryOperators.RightSemiJoin)
+    assert isinstance(root.right, RAOperand) and isinstance(root.left, UnaryOperators.Rename)
+
     # join <-> selection
     root = RAParser.parse_query(r'a ⋈ σ [ Id > 1 ] b')
     assert isinstance(root, BinaryOperators.Join)
@@ -1181,6 +1517,22 @@ def test_mixed_evaluation_order():
     assert isinstance(root, BinaryOperators.FullOuterJoin)
     assert isinstance(root.right, RAOperand) and isinstance(root.left, UnaryOperators.Selection)
 
+    root = RAParser.parse_query(r'a ⋉ σ [ Id > 1 ] b')
+    assert isinstance(root, BinaryOperators.LeftSemiJoin)
+    assert isinstance(root.left, RAOperand) and isinstance(root.right, UnaryOperators.Selection)
+
+    root = RAParser.parse_query(r'σ [ Id > 1 ] a ⋉ b')
+    assert isinstance(root, BinaryOperators.LeftSemiJoin)
+    assert isinstance(root.right, RAOperand) and isinstance(root.left, UnaryOperators.Selection)
+
+    root = RAParser.parse_query(r'a ⋊ σ [ Id > 1 ] b')
+    assert isinstance(root, BinaryOperators.RightSemiJoin)
+    assert isinstance(root.left, RAOperand) and isinstance(root.right, UnaryOperators.Selection)
+
+    root = RAParser.parse_query(r'σ [ Id > 1 ] a ⋊ b')
+    assert isinstance(root, BinaryOperators.RightSemiJoin)
+    assert isinstance(root.right, RAOperand) and isinstance(root.left, UnaryOperators.Selection)
+
     # cross <-> projection
     root = RAParser.parse_query(r'a x π [ Id ] b')
     assert isinstance(root, BinaryOperators.Cross)

{jupyter_duckdb-1.4.105.dist-info → jupyter_duckdb-1.4.106.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jupyter-duckdb
-Version: 1.4.105
+Version: 1.4.106
 Summary: a basic wrapper kernel for DuckDB
 Home-page: https://github.com/erictroebs/jupyter-duckdb
 Author: Eric Tröbs

{jupyter_duckdb-1.4.105.dist-info → jupyter_duckdb-1.4.106.dist-info}/RECORD

@@ -40,10 +40,10 @@ duckdb_kernel/parser/elements/RAOperator.py,sha256=rtqMFBIBBqT-Bwg7Qm4WQwbDrE28N
 duckdb_kernel/parser/elements/RAUnaryOperator.py,sha256=XC1nphkSm88JaEu5V_HKnb_8JNoeBfE3EvNL4o0qh2c,654
 duckdb_kernel/parser/elements/__init__.py,sha256=t5H6SVOm3z8r6UWRYOI7HmMIuB4Yh6TLNu4_N3jg2t0,566
 duckdb_kernel/parser/elements/binary/Add.py,sha256=XGkZMfab01huk9EaI6JUfzkd2STbV1C_-TyC2guKE8I,190
-duckdb_kernel/parser/elements/binary/And.py,sha256=0jgetTG8yo5TJSeK70Kj-PI9ERyek1eyMQXX5HBxa4Y,274
+duckdb_kernel/parser/elements/binary/And.py,sha256=p6TQE49DtHlMlTkH9GqyrQVcYWsVgdIMTTCxNuNORuQ,267
 duckdb_kernel/parser/elements/binary/ArrowLeft.py,sha256=u4fZSoyT9lfvWXBwuhUl4DdjVZAOqyVIKmMVbpElLD4,203
 duckdb_kernel/parser/elements/binary/ConditionalSet.py,sha256=yzUPWO4KL8BEIQ-SiV00bdLulwHoxgoJRxebyhsRSPU,17884
-duckdb_kernel/parser/elements/binary/Cross.py,sha256=jVY3cvD6qDWZkJ7q74lFUPO2VdDt4aAjdk2YAfg-ZC4,687
+duckdb_kernel/parser/elements/binary/Cross.py,sha256=2tsPBPGN2Bmbx50-cCdZcSj7AqQwJugA7B4gECrMdlI,696
 duckdb_kernel/parser/elements/binary/Difference.py,sha256=4nyHhjo09UmYjtGNC3xGQxV5ROzCGOpPkyerUN-AlF4,746
 duckdb_kernel/parser/elements/binary/Divide.py,sha256=ubekU4C1wkCTidUSMLEj5neheRx0QjhWSrsPGuXTa1g,265
 duckdb_kernel/parser/elements/binary/Division.py,sha256=FOYxmeNGljRETwygtVn102POCUmt71t9DXdAnLFCXZM,1535
@@ -54,15 +54,17 @@ duckdb_kernel/parser/elements/binary/GreaterThanEqual.py,sha256=gO1I3J5CZwrpqZb5
 duckdb_kernel/parser/elements/binary/Intersection.py,sha256=K6NrwcLTJ1BUccifVQ2R2YHR5B71LhjuLhOalxZcM0g,757
 duckdb_kernel/parser/elements/binary/Join.py,sha256=9Z3JinEav3ulLbZZZM9DLbprloHC0oGuSm40Kf1A0mM,836
 duckdb_kernel/parser/elements/binary/LeftOuterJoin.py,sha256=qCyHLMboNjzSDK_FREtYVwZx4UYkfRcy3FMo2pEf93o,846
+duckdb_kernel/parser/elements/binary/LeftSemiJoin.py,sha256=u5Xv-vS0wfZsG4X5go--r3JnoDVoeeaI07zKaS2pJiM,828
 duckdb_kernel/parser/elements/binary/LessThan.py,sha256=gNlyAvew0VyvU8x3ol88zbdh_t9GU51Kd2P_PmHUrAc,201
 duckdb_kernel/parser/elements/binary/LessThanEqual.py,sha256=BKKXBZ4TZQ4EBxBDSNzIpFl4Oz1IGI0tI0Oj7KZUoDo,283
 duckdb_kernel/parser/elements/binary/Minus.py,sha256=1XUTXCA0GcAcCnv9nq4B9ewT0XHJ91LlZGEW1y60POA,192
 duckdb_kernel/parser/elements/binary/Multiply.py,sha256=OctlfN71izFYxIpMo09Qwq-3BmQmSh6-PNKBljMsBrg,195
 duckdb_kernel/parser/elements/binary/Or.py,sha256=e1H_BuY7TQD7XHKGqJYLOebYQvrh1euWOUsXF0FT5dY,264
 duckdb_kernel/parser/elements/binary/RightOuterJoin.py,sha256=bDxTEQ_dJZ-MUuGbU1YL69kPFR0Hdkc1fow3wxOxfAY,867
+duckdb_kernel/parser/elements/binary/RightSemiJoin.py,sha256=QYDR27H4sA57vCKIip5o_UKfHAOLpYW6cq36fdUUO4M,848
 duckdb_kernel/parser/elements/binary/Unequal.py,sha256=1hnC1RcPMxwKKv65OL5prunGgh9cRVDmzJutmtl7gtY,269
 duckdb_kernel/parser/elements/binary/Union.py,sha256=VYTj4M2PVEhWiDwjnyP8qpVVbGvIBSVshlEt-SZYCBY,739
-duckdb_kernel/parser/elements/binary/__init__.py,sha256=BieXw51EBgIwUEK-hn4jBb1b4VKJT6sRzaxwOrSXw2A,1342
+duckdb_kernel/parser/elements/binary/__init__.py,sha256=-4ZY6vpsiyT8eDkLwyFGHJFWXIMCNYNz9ejFFcjEG5U,1451
 duckdb_kernel/parser/elements/unary/Not.py,sha256=kG0a-dp3TNjPodUMPiQ6ihtsBrbvn1iWeIPCvtyAwdo,632
 duckdb_kernel/parser/elements/unary/Projection.py,sha256=CJ-MIf1-__1ewTjNZVy5hOz3Z18CWnCDNJBxUdpWXVQ,1112
 duckdb_kernel/parser/elements/unary/Rename.py,sha256=Zr2n9EJ3nA476lND0Djz2b6493nnsbSpJ9kkEgk5B_Y,1273
@@ -77,7 +79,7 @@ duckdb_kernel/parser/util/RenamableColumnList.py,sha256=5oEDbtvl4YfHbkxu_Ny2pc0E
 duckdb_kernel/parser/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 duckdb_kernel/tests/__init__.py,sha256=-BoPfo1FNQKnvAYt22Ioc21dbuO67QVFaV_SmS1zQw8,2731
 duckdb_kernel/tests/test_dc.py,sha256=HPJ6JGB7yXVKIOnDHB8KwX1A16ljU0I5Y8VFcJs-KVI,15192
-duckdb_kernel/tests/test_ra.py,sha256=YEL-Jwc9tIvCT-UGOaqfXJZZH0FAok3cj9sXK59xzkQ,53172
+duckdb_kernel/tests/test_ra.py,sha256=z7ItArWzCIoPp07pgnk8NCxZ0WsjSYIeHChmi-jWE5c,69610
 duckdb_kernel/tests/test_result_comparison.py,sha256=TQVLPKKNyV2k3i4jCfasetPfVfCzgYZr92wxQmlzPnA,3859
 duckdb_kernel/tests/test_sql.py,sha256=p7UEokoJs2xc-url7xQ4PmWKxtExrDDYnMeoyR1JD0A,1208
 duckdb_kernel/util/ResultSetComparator.py,sha256=RZDIfjJyx8-eR-HIqQlEYgZd_V1ympbszpVRF4TlA7o,2262
@@ -94,7 +96,7 @@ duckdb_kernel/visualization/lib/__init__.py,sha256=LYi0YPtn5fXOejbLIqbt_3KzP-Xrw
 duckdb_kernel/visualization/lib/plotly-3.0.1.min.js,sha256=oy6Be7Eh6eiQFs5M7oXuPxxm9qbJXEtTpfSI93dW16Q,4653932
 duckdb_kernel/visualization/lib/ra.css,sha256=foz1v69EQ117BDduB9QyHH978PbRs2TG1kBS4VGqZbI,57
 duckdb_kernel/visualization/lib/ra.js,sha256=VzMRn55ztcd5Kfu2B6gdRPARpi8n-fvs8oNFnfp55Ec,1845
-jupyter_duckdb-1.4.105.dist-info/METADATA,sha256=uuenj_81-ZaSUb0TQ2Sy8-rcrtZsa7GHfZQ7nElAzZ0,9272
-jupyter_duckdb-1.4.105.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jupyter_duckdb-1.4.105.dist-info/top_level.txt,sha256=KvRRPMnmkQNuhyBsXoPmwyt26LRDp0O-0HN6u0Dm5jA,14
-jupyter_duckdb-1.4.105.dist-info/RECORD,,
+jupyter_duckdb-1.4.106.dist-info/METADATA,sha256=IRd1kZI21gT9o4a8GopNzkctOcDixojRttR3ZMk7V4I,9272
+jupyter_duckdb-1.4.106.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jupyter_duckdb-1.4.106.dist-info/top_level.txt,sha256=KvRRPMnmkQNuhyBsXoPmwyt26LRDp0O-0HN6u0Dm5jA,14
+jupyter_duckdb-1.4.106.dist-info/RECORD,,