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

duckdb_kernel/db/implementation/postgres/Connection.py

@@ -5,6 +5,7 @@ from uuid import uuid4
 
 import psycopg
 
+from .util import strip_delimiters
 from ... import DatabaseError, Column, Constraint, ForeignKey, Table
 from ...Connection import Connection as Base
 from ...error import EmptyResultError
@@ -194,9 +195,10 @@ class Connection(Base):
             if match is None:
                 raise AssertionError(f'could not parse foreign key definitions for table {source_table_name}')
 
-            source_table_column_names = [c.strip() for c in match.group(1).split(',')]
-            target_table_name = match.group(2).strip()
-            target_table_column_names = [c.strip() for c in match.group(3).split(',')]
+            source_table_name = strip_delimiters(source_table_name)
+            source_table_column_names = [strip_delimiters(c) for c in match.group(1).split(',')]
+            target_table_name = strip_delimiters(match.group(2))
+            target_table_column_names = [strip_delimiters(c) for c in match.group(3).split(',')]
 
             # get tables
             if source_table_name not in tables:

duckdb_kernel/db/implementation/postgres/util.py

@@ -0,0 +1,14 @@
+_delimiters = ('"', "'")
+
+
+def strip_delimiters(value: str):
+    while True:
+        value = value.strip()
+
+        if len(value) == 0:
+            return value
+
+        if value[0] != value[-1] or value[0] not in _delimiters:
+            return value
+
+        value = value[1:-1]

duckdb_kernel/kernel.py

@@ -13,7 +13,7 @@ from .db.error import *
 from .magics import *
 from .parser import RAParser, DCParser
 from .util.ResultSetComparator import ResultSetComparator
-from .util.formatting import row_count, rows_table, wrap_image, null_str
+from .util.formatting import row_count, rows_table, wrap_image
 from .visualization import *
 
 
@@ -92,7 +92,8 @@ class DuckDBKernel(Kernel):
             # we want to use the postgres driver.
             if path.startswith(('postgresql://', 'postgres://', 'pgsql://', 'psql://', 'pg://')):
                 # pull data from connection string
-                match = re.fullmatch(r'(postgresql|postgres|pgsql|psql|pg)://((.*?)(:(.*?))?@)?(.*?)(:(\d+))?(/(.*))?', path)
+                re_expr = r'(postgresql|postgres|pgsql|psql|pg)://((.*?)(:(.*?))?@)?(.*?)(:(\d+))?(/(.*))?'
+                match = re.fullmatch(re_expr, path)
 
                 host = match.group(6)
                 port = int(match.group(8)) if match.group(8) is not None else 5432
@@ -227,7 +228,7 @@ class DuckDBKernel(Kernel):
         if self._load_database(path):
             if not silent:
                 # self.print(f'loaded database "{path}"\n')
-                self.print(str(self._db))
+                self.print(str(self._db) + '\n')
 
         # copy data from source database
         if of is not None:
@@ -246,11 +247,17 @@ class DuckDBKernel(Kernel):
                     if not self._db.multiple_statements_per_query():
                         statements = re.split(r';\r?\n', content)
                         for statement in statements:
-                            self._db.execute(statement)
+                            try:
+                                self._db.execute(statement)
+                            except EmptyResultError:
+                                pass
 
                     # Other DBMS can execute multiple statements at a time.
                     else:
-                        self._db.execute(content)
+                        try:
+                            self._db.execute(content)
+                        except EmptyResultError:
+                            pass
 
                     if not silent:
                         self.print(f'executed "{of}"\n')

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

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

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

@@ -1,7 +1,7 @@
 duckdb_kernel/__init__.py,sha256=6auU6zeJrsA4fxPSr2PYamS8fG-SMXTn5YQFXF2cseo,33
 duckdb_kernel/__main__.py,sha256=Z3GwHEBWoQjNm2Y84ijnbA0Lk66L7nsFREuqhZ_ptk0,165
 duckdb_kernel/kernel.json,sha256=_7E8Ci2FSdCvnzCjsOaue8QE8AvpS5JLQuxORO5IGtA,127
-duckdb_kernel/kernel.py,sha256=XjRN0_lPQvGFGJ8r8ZveAu09fLXG2IArIXZvU0-DUqs,18393
+duckdb_kernel/kernel.py,sha256=wGHvQRhCu6aHvIRPQYJwb9PfRTYju4kYGx5yIeBsPvw,18666
 duckdb_kernel/db/Column.py,sha256=M9VRAaQ0uEWxZMaXjfFyjaDPpHsLuTSlvGaI5NDo6sM,516
 duckdb_kernel/db/Connection.py,sha256=5pH-CwGh-r9Q2QwJKGSxvoINBU-sqmvZyG4Q1digfeE,599
 duckdb_kernel/db/Constraint.py,sha256=1YgUHk7s8mHCVedbcuJKyXDykj7_ybbwT3Dk9p2VMis,287
@@ -13,8 +13,9 @@ duckdb_kernel/db/error/EmptyResultError.py,sha256=N9Oxi2HDZBKaRQsfRsWpJJGOYX4Bjd
 duckdb_kernel/db/error/__init__.py,sha256=oHfhfbcfyTJ3pAPN835omdQcebvJTauuULFx5gm9rq4,47
 duckdb_kernel/db/implementation/duckdb/Connection.py,sha256=CUpfIv5OVnKv82MsMVB_QEWrxlIDkNGcqxpSpRc9MQU,6086
 duckdb_kernel/db/implementation/duckdb/__init__.py,sha256=HKogB1es4wOiQUoh7_eT32xnUFLmzoCyR_0LuY9r8YQ,35
-duckdb_kernel/db/implementation/postgres/Connection.py,sha256=ztfDIZH34X1XauGATqRNfcKZ81_r-SPfOiPmEgcaOyw,8605
+duckdb_kernel/db/implementation/postgres/Connection.py,sha256=JB5zPMBwt-iySMIeLi1WIvRB0jRckHDUhWw7GtKnndA,8738
 duckdb_kernel/db/implementation/postgres/__init__.py,sha256=HKogB1es4wOiQUoh7_eT32xnUFLmzoCyR_0LuY9r8YQ,35
+duckdb_kernel/db/implementation/postgres/util.py,sha256=4nr1mqXhlwkMVXbJSfJ7dRlUm6UskpvgKApe7GRwmBI,281
 duckdb_kernel/db/implementation/sqlite/Connection.py,sha256=S-cyRlYP0nzITza5yIedXNPMJTM4Z5uY2CP1RPVaycE,6822
 duckdb_kernel/db/implementation/sqlite/__init__.py,sha256=HKogB1es4wOiQUoh7_eT32xnUFLmzoCyR_0LuY9r8YQ,35
 duckdb_kernel/magics/MagicCommand.py,sha256=OoQ6j4cNtIYjaK4MPVzJyv1eYTNu4_a7qoRx-5G3Hg0,2346
@@ -74,7 +75,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.3.dist-info/METADATA,sha256=bNaTQa_rguAVOoSbK3pWKwq4I2hbBDzZXSARO1yg9p8,7748
-jupyter_duckdb-0.9.2.3.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-jupyter_duckdb-0.9.2.3.dist-info/top_level.txt,sha256=KvRRPMnmkQNuhyBsXoPmwyt26LRDp0O-0HN6u0Dm5jA,14
-jupyter_duckdb-0.9.2.3.dist-info/RECORD,,
+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,,