jupyter-duckdb 1.2.0.5__py3-none-any.whl → 1.2.0.6__py3-none-any.whl

duckdb_kernel/db/implementation/duckdb/Connection.py

@@ -4,6 +4,7 @@ import duckdb
 
 from ... import DatabaseError, Column, Constraint, ForeignKey, Table
 from ...Connection import Connection as Base
+from ...error import EmptyResultError
 
 
 class Connection(Base):
@@ -36,7 +37,10 @@ class Connection(Base):
                     raise e
 
             # get rows
-            rows = cursor.fetchall()
+            try:
+                rows = cursor.fetchall()
+            except duckdb.InvalidInputException as e:
+                raise EmptyResultError(str(e))
 
             # get columns
             if cursor.description is None:

duckdb_kernel/db/implementation/sqlite/Connection.py

@@ -4,6 +4,7 @@ from typing import Dict, List, Tuple, Any
 
 from ... import DatabaseError, Column, Constraint, ForeignKey, Table
 from ...Connection import Connection as Base
+from ...error import EmptyResultError
 
 
 class Connection(Base):
@@ -41,7 +42,7 @@ class Connection(Base):
 
             # get columns
             if cursor.description is None:
-                columns = []
+                raise EmptyResultError()
             else:
                 columns = [e[0] for e in cursor.description]
 

duckdb_kernel/kernel.py

@@ -14,6 +14,7 @@ from .db.error import *
 from .magics import *
 from .parser import RAParser, DCParser, ParserError
 from .util.ResultSetComparator import ResultSetComparator
+from .util.SQL import SQL_KEYWORDS
 from .util.TestError import TestError
 from .util.formatting import row_count, rows_table, wrap_image
 from .visualization import *
@@ -46,11 +47,12 @@ class DuckDBKernel(Kernel):
             MagicCommand('query_max_rows').arg('count').on(self._query_max_rows_magic),
             MagicCommand('schema').flag('td').opt('only').on(self._schema_magic),
             MagicCommand('store').arg('file').flag('noheader').result(True).on(self._store_magic),
-            MagicCommand('ra').disable('dc', 'auto_parser').flag('analyze').code(True).on(self._ra_magic),
+            MagicCommand('sql').disable('ra', 'dc', 'auto_parser'),
+            MagicCommand('ra').disable('sql', 'dc', 'auto_parser').flag('analyze').code(True).on(self._ra_magic),
             MagicCommand('all_ra').arg('value', '1').on(self._all_ra_magic),
-            MagicCommand('dc').disable('ra', 'auto_parser').code(True).on(self._dc_magic),
+            MagicCommand('dc').disable('sql', 'ra', 'auto_parser').code(True).on(self._dc_magic),
             MagicCommand('all_dc').arg('value', '1').on(self._all_dc_magic),
-            MagicCommand('auto_parser').disable('ra', 'dc').code(True).on(self._auto_parser_magic),
+            MagicCommand('auto_parser').disable('sql', 'ra', 'dc').code(True).on(self._auto_parser_magic),
             MagicCommand('guess_parser').arg('value', '1').on(self._guess_parser_magic),
         )
 
@@ -301,6 +303,11 @@ class DuckDBKernel(Kernel):
                 self.print(f'loaded tests from {with_tests}\n')
 
     def _test_magic(self, silent: bool, result_columns: List[str], result: List[List], name: str):
+        # If the query was empty, result_columns and result may be None.
+        if result_columns is None or result is None:
+            self.print_data(wrap_image(False, 'Statement did not return data.'))
+            return
+
         # Testing makes no sense if there is no output.
         if silent:
             return
@@ -550,14 +557,22 @@ class DuckDBKernel(Kernel):
             self._magics['auto_parser'].default(False)
 
     def _auto_parser_magic(self, silent: bool, code: str):
+        # do not handle statements starting with SQL keywords
+        first_word = code.strip().split(maxsplit=1)
+        if len(first_word) > 0:
+            if first_word[0].upper() in SQL_KEYWORDS:
+                return
+
+        # try to parse DC
         try:
-            return self._ra_magic(silent, code, analyze=False)
+            return self._dc_magic(silent, code)
         except ParserError as e:
             if e.depth > 0:
                 raise e
 
+        # try to parse RA
         try:
-            return self._dc_magic(silent, code)
+            return self._ra_magic(silent, code, analyze=False)
         except ParserError as e:
             if e.depth > 0:
                 raise e

duckdb_kernel/util/SQL.py

@@ -0,0 +1,6 @@
+# see https://www.postgresql.org/docs/current/sql-commands.html
+SQL_KEYWORDS = ('ABORT', 'ALTER', 'ANALYZE', 'BEGIN', 'CALL', 'CHECKPOINT', 'CLOSE', 'CLUSTER', 'COMMENT', 'COMMIT',
+                'COPY', 'CREATE', 'DEALLOCATE', 'DECLARE', 'DELETE', 'DISCARD', 'DO', 'DROP', 'END', 'EXECUTE',
+                'EXPLAIN', 'FETCH', 'GRANT', 'IMPORT', 'INSERT', 'LISTEN', 'LOAD', 'LOCK', 'MERGE', 'MOVE', 'NOTIFY',
+                'PREPARE', 'REASSIGN', 'REFRESH', 'REINDEX', 'RELEASE', 'RESET', 'REVOKE', 'ROLLBACK', 'SAVEPOINT',
+                'SECURITY', 'SELECT', 'SET', 'SHOW', 'START', 'TRUNCATE', 'UNLISTEN', 'UPDATE', 'VACUUM', 'VALUES')

{jupyter_duckdb-1.2.0.5.dist-info → jupyter_duckdb-1.2.0.6.dist-info}/METADATA

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

{jupyter_duckdb-1.2.0.5.dist-info → jupyter_duckdb-1.2.0.6.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=4OFNtWvrfSs27udrk9e1ClBMdltvLA9gJemSBZskj0k,21827
+duckdb_kernel/kernel.py,sha256=iiX9JzSgIvno1tWc2ZJGYHts8J3P7md4yanMrsbMJkY,22454
 duckdb_kernel/db/Column.py,sha256=GM5P6sFdlYK92hiKln5-6038gIDOTxh1AYbR4kiga_w,559
 duckdb_kernel/db/Connection.py,sha256=5pH-CwGh-r9Q2QwJKGSxvoINBU-sqmvZyG4Q1digfeE,599
 duckdb_kernel/db/Constraint.py,sha256=1YgUHk7s8mHCVedbcuJKyXDykj7_ybbwT3Dk9p2VMis,287
@@ -11,12 +11,12 @@ duckdb_kernel/db/Table.py,sha256=HfvGX54kD_XvmLApYSmxtTQNvz2YYaaUNpm4e8dSOVY,934
 duckdb_kernel/db/__init__.py,sha256=PKQYQDCW7VQYxmzhQK6A0Qloka9FdMfeFQMfY-CjBSA,198
 duckdb_kernel/db/error/EmptyResultError.py,sha256=N9Oxi2HDZBKaRQsfRsWpJJGOYX4BjdQqWOU-XvzUzNY,92
 duckdb_kernel/db/error/__init__.py,sha256=oHfhfbcfyTJ3pAPN835omdQcebvJTauuULFx5gm9rq4,47
-duckdb_kernel/db/implementation/duckdb/Connection.py,sha256=4zBgK9xYSV2m7tSl81kLOqGhByP7UhyCZxDuLVpZz7c,6817
+duckdb_kernel/db/implementation/duckdb/Connection.py,sha256=uBL-UVrSo8EJNXnnyAc2AwAYJ1QQQmH0noV6pnngZHs,6977
 duckdb_kernel/db/implementation/duckdb/__init__.py,sha256=HKogB1es4wOiQUoh7_eT32xnUFLmzoCyR_0LuY9r8YQ,35
 duckdb_kernel/db/implementation/postgres/Connection.py,sha256=39wv-mvKHdu4u_ADFiSbAvGMVEs3FtuzRYIH4uzJ-pw,9307
 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=L-aSUuN_7Z-hc5wczLjap2Xu-Vv6-dXmwXcN_WE8o98,6994
+duckdb_kernel/db/implementation/sqlite/Connection.py,sha256=SSLpdigWjO_3lUXdsx3eH5OXOTBlZiXOgIyPCf6L8D0,7044
 duckdb_kernel/db/implementation/sqlite/__init__.py,sha256=HKogB1es4wOiQUoh7_eT32xnUFLmzoCyR_0LuY9r8YQ,35
 duckdb_kernel/magics/MagicCommand.py,sha256=l0EmnqgGZ0HyqQhdTljAaftflVo_RYp-U5UiDftYxAA,3180
 duckdb_kernel/magics/MagicCommandCallback.py,sha256=9XVidNtzs8Lwq_T59VrH89t5LUgJcc5C7grusElXVW4,1041
@@ -72,6 +72,7 @@ duckdb_kernel/parser/util/RenamableColumn.py,sha256=LxJhFDMUv_OxYYDLwKn63QGpBRfs
 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/SQL.py,sha256=-uRfa0IwEQueZNZ7vkBPczLuvm_87y4_nnMBx3FgqNk,643
 duckdb_kernel/util/TestError.py,sha256=iwlGHr9j6pFDa2cGxqGyvJ-exrFUtPJjVm_OhHi4n3g,97
 duckdb_kernel/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 duckdb_kernel/util/formatting.py,sha256=cbt0CtERnqtzd97mLrOjeJpqM2Lo6pW96BjAYqrOTD8,793
@@ -79,7 +80,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=9K-TUUmyeGdMYMTFQJ7evIU3p8p2KyMKeizUc7-y8co,3015
 duckdb_kernel/visualization/__init__.py,sha256=5eMJmxJ01XAXcgWDn3t70eSZF2PGaXdNo6GK-x-0H3s,78
-jupyter_duckdb-1.2.0.5.dist-info/METADATA,sha256=7twgLgE-u5--Y9lV-JCtqPoUFSL8GAwdPyVcmu1NzjA,9115
-jupyter_duckdb-1.2.0.5.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-jupyter_duckdb-1.2.0.5.dist-info/top_level.txt,sha256=KvRRPMnmkQNuhyBsXoPmwyt26LRDp0O-0HN6u0Dm5jA,14
-jupyter_duckdb-1.2.0.5.dist-info/RECORD,,
+jupyter_duckdb-1.2.0.6.dist-info/METADATA,sha256=CpGdT2u47HAdtsRNJpQJeQvQPIuBVXVLfYyybbrxQnY,9115
+jupyter_duckdb-1.2.0.6.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+jupyter_duckdb-1.2.0.6.dist-info/top_level.txt,sha256=KvRRPMnmkQNuhyBsXoPmwyt26LRDp0O-0HN6u0Dm5jA,14
+jupyter_duckdb-1.2.0.6.dist-info/RECORD,,

{jupyter_duckdb-1.2.0.5.dist-info → jupyter_duckdb-1.2.0.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (75.8.2)
 Root-Is-Purelib: true
 Tag: py3-none-any