jupyter-duckdb 0.9.2.3__tar.gz → 0.9.2.5__tar.gz

{jupyter-duckdb-0.9.2.3 → jupyter-duckdb-0.9.2.5}/PKG-INFO

@@ -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 → jupyter-duckdb-0.9.2.5}/src/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:

jupyter-duckdb-0.9.2.5/src/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]

{jupyter-duckdb-0.9.2.3 → jupyter-duckdb-0.9.2.5}/src/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 → jupyter-duckdb-0.9.2.5}/src/jupyter_duckdb.egg-info/PKG-INFO

@@ -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 → jupyter-duckdb-0.9.2.5}/src/jupyter_duckdb.egg-info/SOURCES.txt

@@ -17,6 +17,7 @@ src/duckdb_kernel/db/implementation/duckdb/Connection.py
 src/duckdb_kernel/db/implementation/duckdb/__init__.py
 src/duckdb_kernel/db/implementation/postgres/Connection.py
 src/duckdb_kernel/db/implementation/postgres/__init__.py
+src/duckdb_kernel/db/implementation/postgres/util.py
 src/duckdb_kernel/db/implementation/sqlite/Connection.py
 src/duckdb_kernel/db/implementation/sqlite/__init__.py
 src/duckdb_kernel/magics/MagicCommand.py