jupyter-duckdb 1.2.0.5__tar.gz → 1.2.0.6__tar.gz

{jupyter_duckdb-1.2.0.5 → jupyter_duckdb-1.2.0.6}/PKG-INFO

@@ -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 → jupyter_duckdb-1.2.0.6}/src/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:

{jupyter_duckdb-1.2.0.5 → jupyter_duckdb-1.2.0.6}/src/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]
 

{jupyter_duckdb-1.2.0.5 → jupyter_duckdb-1.2.0.6}/src/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

jupyter_duckdb-1.2.0.6/src/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 → jupyter_duckdb-1.2.0.6}/src/jupyter_duckdb.egg-info/PKG-INFO

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

@@ -74,6 +74,7 @@ src/duckdb_kernel/parser/util/RenamableColumn.py
 src/duckdb_kernel/parser/util/RenamableColumnList.py
 src/duckdb_kernel/parser/util/__init__.py
 src/duckdb_kernel/util/ResultSetComparator.py
+src/duckdb_kernel/util/SQL.py
 src/duckdb_kernel/util/TestError.py
 src/duckdb_kernel/util/__init__.py
 src/duckdb_kernel/util/formatting.py
@@ -88,4 +89,5 @@ src/jupyter_duckdb.egg-info/requires.txt
 src/jupyter_duckdb.egg-info/top_level.txt
 test/test_dc.py
 test/test_ra.py
-test/test_result_comparison.py
+test/test_result_comparison.py
+test/test_sql.py

jupyter_duckdb-1.2.0.6/test/test_sql.py

@@ -0,0 +1,48 @@
+import pytest
+
+from duckdb_kernel.db.error import EmptyResultError
+from . import Connection
+
+
+def test_simple_queries():
+    query = 'SELECT Username FROM Users'
+
+    with Connection() as con:
+        assert con.execute_sql(query) == [
+            ('Alice',),
+            ('Bob',),
+            ('Charlie',)
+        ]
+
+
+def test_empty_result():
+    with Connection() as con:
+        query = "SELECT Username FROM Users WHERE Username = 'abcdef'"
+        assert con.execute_sql(query) == []
+
+    with Connection() as con:
+        query = 'CREATE TABLE foo (bar INTEGER PRIMARY KEY)'
+        try:
+            assert con.execute_sql(query) == []
+        except EmptyResultError:
+            pass
+
+
+def test_empty_queries():
+    for query in [
+        '',
+        ' ',
+        '\n',
+        '-- this is an empty query too'
+    ]:
+        with pytest.raises(EmptyResultError):
+            with Connection() as con:
+                con.execute_sql(query)
+
+    with pytest.raises(Exception):
+        with Connection() as con:
+            query = '-- this is a query with syntax errors\nFOR foo IN bar'
+            try:
+                con.execute_sql(query)
+            except EmptyResultError:
+                pass