jupyter-duckdb 1.1.2.1__tar.gz → 1.1.2.3__tar.gz

{jupyter_duckdb-1.1.2.1 → jupyter_duckdb-1.1.2.3}/PKG-INFO

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

{jupyter_duckdb-1.1.2.1 → jupyter_duckdb-1.1.2.3}/src/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__()

{jupyter_duckdb-1.1.2.1 → jupyter_duckdb-1.1.2.3}/src/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.

{jupyter_duckdb-1.1.2.1 → jupyter_duckdb-1.1.2.3}/src/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.

{jupyter_duckdb-1.1.2.1 → jupyter_duckdb-1.1.2.3}/src/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.

{jupyter_duckdb-1.1.2.1 → jupyter_duckdb-1.1.2.3}/src/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

{jupyter_duckdb-1.1.2.1 → jupyter_duckdb-1.1.2.3}/src/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.1 → jupyter_duckdb-1.1.2.3}/src/jupyter_duckdb.egg-info/PKG-INFO

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