jupyter-duckdb 0.9.2.5__py3-none-any.whl → 0.10.1.1__py3-none-any.whl

duckdb_kernel/parser/elements/binary/Difference.py

@@ -17,7 +17,7 @@ class Difference(RABinaryOperator):
 
         # check number of columns
         if len(lcols) != len(rcols):
-            raise AssertionError(f'difference can only be applied to relations with the same number of columns')
+            raise AssertionError('difference can only be applied to relations with the same number of columns')
 
         # create sql
         return f'{lq} EXCEPT {rq}', lcols

duckdb_kernel/parser/elements/binary/Division.py

@@ -0,0 +1,48 @@
+from typing import Tuple, Dict
+
+from duckdb_kernel.db import Table
+from ..RABinaryOperator import RABinaryOperator
+from ...util.RenamableColumnList import RenamableColumnList
+
+
+class Division(RABinaryOperator):
+    @staticmethod
+    def symbols() -> Tuple[str, ...]:
+        return '÷', ':'
+
+    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)
+
+        # difference and intersection preparation
+        diff_cols = lcols.difference(rcols)
+        diff_name = ', '.join(c.current_name for c in diff_cols)
+
+        inter_cols, p = lcols.intersect(rcols)
+        if len(inter_cols) == 0:
+            raise AssertionError('divison can only be applied to relations with common columns')
+
+        inter_name = ' AND '.join(f'{r.current_name} = {l.current_name}' for l, r in inter_cols)
+        # inter_name_left = ', '.join(l.current_name for l, _ in inter_cols)
+        inter_name_right = ', '.join(r.current_name for _, r in inter_cols)
+
+        print('-', diff_name)
+        print(inter_name)
+        print(inter_name_right)
+
+        # create sql
+        return f'''
+            SELECT {diff_name}
+            FROM ({lq}) {self._name()}
+            WHERE EXISTS (
+                SELECT {inter_name_right}
+                FROM ({rq}) {self._name()}
+                WHERE {inter_name}
+            )
+            GROUP BY {diff_name}
+            HAVING COUNT(*) = (
+                SELECT COUNT(*)
+                FROM ({rq}) {self._name()}
+            )
+        ''', diff_cols

duckdb_kernel/parser/elements/binary/__init__.py

@@ -9,6 +9,7 @@ from .And import And
 from .ArrowLeft import ArrowLeft
 from .ConditionalSet import ConditionalSet
 from .Divide import Divide
+from .Division import Division
 from .Equal import Equal
 from .GreaterThan import GreaterThan
 from .GreaterThanEqual import GreaterThanEqual
@@ -33,7 +34,8 @@ RA_BINARY_OPERATORS = [
     Union,
     Intersection,
     Join,
-    Cross
+    Cross,
+    Division
 ]
 
 DC_SET = ConditionalSet

duckdb_kernel/parser/util/RenamableColumnList.py

@@ -61,6 +61,18 @@ class RenamableColumnList(list[RenamableColumn]):
 
         return RenamableColumnList(cols.values())
 
+    def difference(self, other: 'RenamableColumnList') -> 'RenamableColumnList':
+        cols: Dict[str, RenamableColumn] = {}
+
+        for col in self:
+            cols[col.name] = col
+
+        for col in other:
+            if col.name in cols:
+                del cols[col.name]
+
+        return RenamableColumnList(cols.values())
+
     def intersect(self, other: 'RenamableColumnList') \
             -> Tuple[List[Tuple[RenamableColumn, RenamableColumn]], 'RenamableColumnList']:
         self_cols: Dict[str, RenamableColumn] = {col.name: col for col in self}

{jupyter_duckdb-0.9.2.5.dist-info → jupyter_duckdb-0.10.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jupyter-duckdb
-Version: 0.9.2.5
+Version: 0.10.1.1
 Summary: a basic wrapper kernel for DuckDB
 Home-page: https://github.com/erictroebs/jupyter-duckdb
 Author: Eric Tröbs
@@ -14,7 +14,7 @@ Description-Content-Type: text/markdown
 Requires-Dist: jupyter
 Requires-Dist: graphviz ==0.20.1
 Requires-Dist: checkmarkandcross
-Requires-Dist: duckdb ==0.9.2
+Requires-Dist: duckdb ==0.10.1
 
 # DuckDB Kernel for Jupyter
 
@@ -247,6 +247,7 @@ The supported operations are:
 - Difference `\`
 - Natural Join `⋈`
 - Cross Product `×`
+- Division `÷`
 
 The Dockerfile also installs the Jupyter Lab plugin
 [jupyter-ra-extension](https://pypi.org/project/jupyter-ra-extension/). It adds

{jupyter_duckdb-0.9.2.5.dist-info → jupyter_duckdb-0.10.1.1.dist-info}/RECORD

@@ -42,8 +42,9 @@ duckdb_kernel/parser/elements/binary/And.py,sha256=0jgetTG8yo5TJSeK70Kj-PI9ERyek
 duckdb_kernel/parser/elements/binary/ArrowLeft.py,sha256=u4fZSoyT9lfvWXBwuhUl4DdjVZAOqyVIKmMVbpElLD4,203
 duckdb_kernel/parser/elements/binary/ConditionalSet.py,sha256=OKpUsTP3HzsDg0vVkb3JqWZd5AUL1RnZXmF-8qWoRq8,16649
 duckdb_kernel/parser/elements/binary/Cross.py,sha256=jVY3cvD6qDWZkJ7q74lFUPO2VdDt4aAjdk2YAfg-ZC4,687
-duckdb_kernel/parser/elements/binary/Difference.py,sha256=2oCdVm2dgd4Xh6ysLqqv1JgfNS_Bjtd8oA-kNBoFLf0,743
+duckdb_kernel/parser/elements/binary/Difference.py,sha256=ZVRgJHYVMOFwnc97oPvGtKvLvHsjSCsn2Aao6ymxY8Y,742
 duckdb_kernel/parser/elements/binary/Divide.py,sha256=d7mzaOeRYSRO1F-2IHsv_C939TuYtLppbf4-5GSRJXs,265
+duckdb_kernel/parser/elements/binary/Division.py,sha256=Tq98RzGHN7QYF3R2ZVpwIiLhSIMQXzRgIuZ7l0D2fXg,1624
 duckdb_kernel/parser/elements/binary/Equal.py,sha256=xd5eMwVwM7thXqmoBg-JSux4y6osxxznNzaChmgrnGI,192
 duckdb_kernel/parser/elements/binary/GreaterThan.py,sha256=lW7EPYjwwZ1VLZOE4ai6MBW7Zq5itsUTi_v6FxoAuU0,204
 duckdb_kernel/parser/elements/binary/GreaterThanEqual.py,sha256=gO1I3J5CZwrpqZb5Oc-WJ_fCnGylpj4YKl4s-ZAr_-4,286
@@ -56,7 +57,7 @@ duckdb_kernel/parser/elements/binary/Multiply.py,sha256=OctlfN71izFYxIpMo09Qwq-3
 duckdb_kernel/parser/elements/binary/Or.py,sha256=e1H_BuY7TQD7XHKGqJYLOebYQvrh1euWOUsXF0FT5dY,264
 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=P_IoOcXPHNlK81PBveFeJW1NimNEadtzuUdRtJLatpU,938
+duckdb_kernel/parser/elements/binary/__init__.py,sha256=PtZgC0vOQONRx0FnFvzaxK9dYobdCykbQATP20djivA,983
 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
@@ -66,7 +67,7 @@ duckdb_kernel/parser/tokenizer/Token.py,sha256=vwN5hHg11kqzOHLeL5GO1c1BbCTZzYDTu
 duckdb_kernel/parser/tokenizer/Tokenizer.py,sha256=PWGgS7gYgpULiKGDho842UbaXuqmwEkccixuF10oi5g,5081
 duckdb_kernel/parser/tokenizer/__init__.py,sha256=EOSmfc2RJwtB5cE1Hhj1JAra97tckxxS8-legybPy60,58
 duckdb_kernel/parser/util/RenamableColumn.py,sha256=GjonYJHAP86PY_Ysn_kgfuLwz4ax3d5e57e-1KDohng,664
-duckdb_kernel/parser/util/RenamableColumnList.py,sha256=sKdozdlNXwG9kaEvBFMmVgRvfDLjKoZ4M9tfZ9ucJiY,2682
+duckdb_kernel/parser/util/RenamableColumnList.py,sha256=GfhdGv4KYT64Z9YA9TCn-7hhcEcc3Gu3vI2zMZ52w-8,3015
 duckdb_kernel/parser/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 duckdb_kernel/util/ResultSetComparator.py,sha256=RZDIfjJyx8-eR-HIqQlEYgZd_V1ympbszpVRF4TlA7o,2262
 duckdb_kernel/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -75,7 +76,7 @@ duckdb_kernel/visualization/Drawer.py,sha256=D0LkiGMvuJ2v6cQSg_axLTGaM4VXAJEQJAy
 duckdb_kernel/visualization/RATreeDrawer.py,sha256=j-Vy1zpYMzwZ3CsphyfPW-J7ou9a9tM6aXXgAlQTgDI,2128
 duckdb_kernel/visualization/SchemaDrawer.py,sha256=fkp7tnyfzKQBXVI6X7efAvT8lczi_XlA7Hc_rhP_47s,2955
 duckdb_kernel/visualization/__init__.py,sha256=5eMJmxJ01XAXcgWDn3t70eSZF2PGaXdNo6GK-x-0H3s,78
-jupyter_duckdb-0.9.2.5.dist-info/METADATA,sha256=bKmADNZ499mCqEeOktQpoPT4hXv4p91zo9bL4k4zxjQ,7748
-jupyter_duckdb-0.9.2.5.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-jupyter_duckdb-0.9.2.5.dist-info/top_level.txt,sha256=KvRRPMnmkQNuhyBsXoPmwyt26LRDp0O-0HN6u0Dm5jA,14
-jupyter_duckdb-0.9.2.5.dist-info/RECORD,,
+jupyter_duckdb-0.10.1.1.dist-info/METADATA,sha256=MbKFIsoNRRr_F2BL9wNrTaEW7xFlE4NZJ_1HVDvw_XY,7766
+jupyter_duckdb-0.10.1.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+jupyter_duckdb-0.10.1.1.dist-info/top_level.txt,sha256=KvRRPMnmkQNuhyBsXoPmwyt26LRDp0O-0HN6u0Dm5jA,14
+jupyter_duckdb-0.10.1.1.dist-info/RECORD,,

{jupyter_duckdb-0.9.2.5.dist-info → jupyter_duckdb-0.10.1.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: true
 Tag: py3-none-any