jupyter-duckdb 1.1.2.2__py3-none-any.whl → 1.1.3.1__py3-none-any.whl

duckdb_kernel/db/Column.py

@@ -4,10 +4,11 @@ from .Table import Table
 
 
 class Column:
-    def __init__(self, table: Table, name: str, data_type: str):
+    def __init__(self, table: Table, name: str, data_type: str, null: bool):
         self.table: Table = table
         self.name: str = name
         self.data_type: str = data_type
+        self.null: bool = null
 
     def __hash__(self):
         return self.name.__hash__()

duckdb_kernel/db/implementation/duckdb/Connection.py

@@ -48,7 +48,7 @@ class Connection(Base):
 
     def analyze(self) -> Dict[str, Table]:
         tables: Dict[str, Table] = {}
-        constraints: Dict[int, Constraint] = {}
+        constraints: Dict[Tuple, Constraint] = {}
 
         # Get table names first. In the columns table we can not filter
         # for base tables and some of the tables might not be contained
@@ -62,18 +62,19 @@ class Connection(Base):
             tables[table_name] = table
 
         # Get column names and data types for each table.
-        for table_name, column_name, data_type in self.con.execute('''
+        for table_name, column_name, data_type, is_nullable in self.con.execute('''
                     SELECT
                         table_name,
                         column_name,
-                        data_type
+                        data_type,
+                        is_nullable
                     FROM information_schema.columns
                     ORDER BY ordinal_position ASC
                 ''').fetchall():
             if table_name in tables:
                 table = tables[table_name]
 
-                column = Column(table, column_name, data_type)
+                column = Column(table, column_name, data_type, is_nullable == 'YES')
                 table.columns.append(column)
 
         # Find primary keys.

duckdb_kernel/db/implementation/postgres/Connection.py

@@ -91,18 +91,19 @@ class Connection(Base):
             tables[table_name] = table
 
         # Get column names and data types for each table.
-        for table_name, column_name, data_type in self.con.execute('''
+        for table_name, column_name, data_type, is_nullable in self.con.execute('''
                     SELECT
                         table_name,
                         column_name,
-                        data_type
+                        data_type,
+                        is_nullable
                     FROM information_schema.columns
                     ORDER BY ordinal_position ASC
                 ''').fetchall():
             if table_name in tables:
                 table = tables[table_name]
 
-                column = Column(table, column_name, data_type)
+                column = Column(table, column_name, data_type, is_nullable == 'YES')
                 table.columns.append(column)
 
         # Find primary keys.

duckdb_kernel/db/implementation/sqlite/Connection.py

@@ -8,6 +8,7 @@ from ...Connection import Connection as Base
 
 class Connection(Base):
     def __init__(self, path: str):
+        self.path: str = path
         self.con: sqlite3.Connection = sqlite3.connect(path)
         self.con.execute('PRAGMA foreign_keys = ON')
 
@@ -64,11 +65,11 @@ class Connection(Base):
 
             # Get column names and data types for each table.
             for table_name, table in tables.items():
-                for column_name, data_type in self.con.execute(f'''
-                    SELECT name, type
+                for column_name, data_type, not_null in self.con.execute(f'''
+                    SELECT name, type, "notnull"
                     FROM pragma_table_info('{table_name}')
                 '''):
-                    column = Column(table, column_name, data_type)
+                    column = Column(table, column_name, data_type, not_null == 0)
                     table.columns.append(column)
 
             # Find primary keys.

duckdb_kernel/parser/util/RenamableColumn.py

@@ -5,7 +5,7 @@ from duckdb_kernel.db import Column
 
 class RenamableColumn(Column):
     def __init__(self, c: Column):
-        super().__init__(c.table, c.name, c.data_type)
+        super().__init__(c.table, c.name, c.data_type, c.null)
         self.current_name: str = c.name
 
     @property

duckdb_kernel/visualization/SchemaDrawer.py

@@ -56,7 +56,10 @@ class SchemaDrawer(Drawer):
     @staticmethod
     def __column_to_html(table: Table, column: Column, fk_counter: Dict[str, int]):
         name = column.name
+
         data_type = column.data_type
+        if column.null:
+            data_type += ' (NULL)'
 
         # extract and style column name
         if table.primary_key is not None and column in table.primary_key.columns:

{jupyter_duckdb-1.1.2.2.dist-info → jupyter_duckdb-1.1.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jupyter-duckdb
-Version: 1.1.2.2
+Version: 1.1.3.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.3
 Requires-Dist: checkmarkandcross
-Requires-Dist: duckdb ==1.1.2
+Requires-Dist: duckdb ==1.1.3
 
 # DuckDB Kernel for Jupyter
 

{jupyter_duckdb-1.1.2.2.dist-info → jupyter_duckdb-1.1.3.1.dist-info}/RECORD

@@ -2,7 +2,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=wGHvQRhCu6aHvIRPQYJwb9PfRTYju4kYGx5yIeBsPvw,18666
-duckdb_kernel/db/Column.py,sha256=M9VRAaQ0uEWxZMaXjfFyjaDPpHsLuTSlvGaI5NDo6sM,516
+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
 duckdb_kernel/db/DatabaseError.py,sha256=43zl8yym1f-fxH_UtGIbWnDnBE_TRwr9aCziY9t40QY,41
@@ -11,12 +11,12 @@ duckdb_kernel/db/Table.py,sha256=6M_CTBV3QlrL_7CdYfu6s9LelXBQ5RdMUAyntE6xcDI,746
 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=aGW1QKcwxTb9N49v_Y7AUCs8ZEH4cthFycISDasQ-_4,6321
+duckdb_kernel/db/implementation/duckdb/Connection.py,sha256=znJ9mTbE4pjCLTVY_10PRAq_mv7NnxnnOuXOkKCNtSo,6395
 duckdb_kernel/db/implementation/duckdb/__init__.py,sha256=HKogB1es4wOiQUoh7_eT32xnUFLmzoCyR_0LuY9r8YQ,35
-duckdb_kernel/db/implementation/postgres/Connection.py,sha256=JB5zPMBwt-iySMIeLi1WIvRB0jRckHDUhWw7GtKnndA,8738
+duckdb_kernel/db/implementation/postgres/Connection.py,sha256=K8DRKJ5UyAJgRhMMIivhfUNzFIDarc_EmwCuRaPBGQ0,8810
 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/Connection.py,sha256=51I9G03PRLmreV2vlb7VVYjooAW13vlcFnimNuliLdo,6888
 duckdb_kernel/db/implementation/sqlite/__init__.py,sha256=HKogB1es4wOiQUoh7_eT32xnUFLmzoCyR_0LuY9r8YQ,35
 duckdb_kernel/magics/MagicCommand.py,sha256=OoQ6j4cNtIYjaK4MPVzJyv1eYTNu4_a7qoRx-5G3Hg0,2346
 duckdb_kernel/magics/MagicCommandCallback.py,sha256=r1kkJyRR7sZnrnlMH3w4bGqDAJL-BVTIB4-Kn66ynlM,764
@@ -66,7 +66,7 @@ duckdb_kernel/parser/elements/unary/__init__.py,sha256=48EDygy0pD7l3J_BlXGc-b7HY
 duckdb_kernel/parser/tokenizer/Token.py,sha256=vwN5hHg11kqzOHLeL5GO1c1BbCTZzYDTuy0QR4kDzew,1800
 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/RenamableColumn.py,sha256=-wajWBUH-IgucoF7zRxoNPgD5syUOcKzE4crqFUXlXg,672
 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
@@ -74,9 +74,9 @@ duckdb_kernel/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 duckdb_kernel/util/formatting.py,sha256=cbt0CtERnqtzd97mLrOjeJpqM2Lo6pW96BjAYqrOTD8,793
 duckdb_kernel/visualization/Drawer.py,sha256=D0LkiGMvuJ2v6cQSg_axLTGaM4VXAJEQJAynvedQ3So,296
 duckdb_kernel/visualization/RATreeDrawer.py,sha256=j-Vy1zpYMzwZ3CsphyfPW-J7ou9a9tM6aXXgAlQTgDI,2128
-duckdb_kernel/visualization/SchemaDrawer.py,sha256=fkp7tnyfzKQBXVI6X7efAvT8lczi_XlA7Hc_rhP_47s,2955
+duckdb_kernel/visualization/SchemaDrawer.py,sha256=9K-TUUmyeGdMYMTFQJ7evIU3p8p2KyMKeizUc7-y8co,3015
 duckdb_kernel/visualization/__init__.py,sha256=5eMJmxJ01XAXcgWDn3t70eSZF2PGaXdNo6GK-x-0H3s,78
-jupyter_duckdb-1.1.2.2.dist-info/METADATA,sha256=8Joa68bCUqAAPthLzyyKGVmcovgdptswfBuJuq2WFTk,7764
-jupyter_duckdb-1.1.2.2.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-jupyter_duckdb-1.1.2.2.dist-info/top_level.txt,sha256=KvRRPMnmkQNuhyBsXoPmwyt26LRDp0O-0HN6u0Dm5jA,14
-jupyter_duckdb-1.1.2.2.dist-info/RECORD,,
+jupyter_duckdb-1.1.3.1.dist-info/METADATA,sha256=wX-USnHaOptE1CkvS0Sx643zmq7NBzvp1FA69Y9CNVI,7764
+jupyter_duckdb-1.1.3.1.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+jupyter_duckdb-1.1.3.1.dist-info/top_level.txt,sha256=KvRRPMnmkQNuhyBsXoPmwyt26LRDp0O-0HN6u0Dm5jA,14
+jupyter_duckdb-1.1.3.1.dist-info/RECORD,,

{jupyter_duckdb-1.1.2.2.dist-info → jupyter_duckdb-1.1.3.1.dist-info}/WHEEL

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