jupyter-duckdb 1.2.0.1__py3-none-any.whl → 1.2.0.3__py3-none-any.whl

duckdb_kernel/db/Table.py

@@ -14,11 +14,19 @@ class Table:
         self.unique_keys: List[Constraint] = []
         self.foreign_keys: List[ForeignKey] = []
 
+    @staticmethod
+    def normalize_name(name: str) -> str:
+        return name.lower()
+
     @property
     def id(self) -> str:
         name = re.sub(r'[^A-Za-z]', '_', self.name)
         return f'table_{name}'
 
+    @property
+    def normalized_name(self) -> str:
+        return self.normalize_name(self.name)
+
     def get_column(self, name: str) -> "Column":
         for column in self.columns:
             if column.name == name:

duckdb_kernel/db/implementation/duckdb/Connection.py

@@ -59,7 +59,7 @@ class Connection(Base):
                     WHERE table_type == 'BASE TABLE'
                 ''').fetchall():
             table = Table(table_name)
-            tables[table_name] = table
+            tables[table.normalized_name] = table
 
         # Get column names and data types for each table.
         for table_name, column_name, data_type, is_nullable in self.con.execute('''
@@ -71,8 +71,9 @@ class Connection(Base):
                     FROM information_schema.columns
                     ORDER BY ordinal_position ASC
                 ''').fetchall():
-            if table_name in tables:
-                table = tables[table_name]
+            normalized_table_name = Table.normalize_name(table_name)
+            if normalized_table_name in tables:
+                table = tables[normalized_table_name]
 
                 column = Column(table, column_name, data_type, is_nullable == 'YES')
                 table.columns.append(column)
@@ -88,10 +89,12 @@ class Connection(Base):
                     ORDER BY constraint_index ASC
                 ''').fetchall():
             # get table
-            if table_name not in tables:
+            normalized_table_name = Table.normalize_name(table_name)
+
+            if normalized_table_name not in tables:
                 raise AssertionError(f'unknown table {table_name} for constraint {constraint_index}')
 
-            table = tables[table_name]
+            table = tables[normalized_table_name]
 
             # store constraint
             if constraint_index in constraints:
@@ -102,7 +105,7 @@ class Connection(Base):
                 table,
                 tuple(table.get_column(c) for c in constraint_columns)
             )
-            constraints[(table_name, *constraint_columns)] = constraint
+            constraints[(normalized_table_name, *constraint_columns)] = constraint
 
             # store key
             if table.primary_key is not None:
@@ -121,10 +124,12 @@ class Connection(Base):
                     ORDER BY constraint_index ASC
                 ''').fetchall():
             # get table
-            if table_name not in tables:
+            normalized_table_name = Table.normalize_name(table_name)
+
+            if normalized_table_name not in tables:
                 raise AssertionError(f'unknown table {table_name} for constraint {constraint_index}')
 
-            table = tables[table_name]
+            table = tables[normalized_table_name]
 
             # store constraint
             if constraint_index in constraints:
@@ -135,7 +140,7 @@ class Connection(Base):
                 table,
                 tuple(table.get_column(c) for c in constraint_columns)
             )
-            constraints[(table_name, *constraint_columns)] = constraint
+            constraints[(normalized_table_name, *constraint_columns)] = constraint
 
             # store key
             table.unique_keys.append(constraint)
@@ -153,13 +158,15 @@ class Connection(Base):
                     ORDER BY constraint_index ASC
                 ''').fetchall():
             # get table
-            if table_name not in tables:
+            normalized_table_name = Table.normalize_name(table_name)
+
+            if normalized_table_name not in tables:
                 raise AssertionError(f'unknown table {table_name} for constraint {constraint_index}')
 
-            table = tables[table_name]
+            table = tables[normalized_table_name]
 
             # lookup constraint
-            constraint_key = (referenced_table, *referenced_column_names)
+            constraint_key = (Table.normalize_name(referenced_table), *referenced_column_names)
             if constraint_key not in constraints:
                 raise AssertionError(f'constraint with key {constraint_key} not discovered previously')
 

duckdb_kernel/db/implementation/postgres/Connection.py

@@ -88,7 +88,7 @@ class Connection(Base):
             WHERE table_schema='public' AND table_type='BASE TABLE'
         ''').fetchall():
             table = Table(table_name)
-            tables[table_name] = table
+            tables[table.normalized_name] = table
 
         # Get column names and data types for each table.
         for table_name, column_name, data_type, is_nullable in self.con.execute('''
@@ -100,8 +100,9 @@ class Connection(Base):
                     FROM information_schema.columns
                     ORDER BY ordinal_position ASC
                 ''').fetchall():
-            if table_name in tables:
-                table = tables[table_name]
+            normalized_table_name = Table.normalize_name(table_name)
+            if normalized_table_name in tables:
+                table = tables[normalized_table_name]
 
                 column = Column(table, column_name, data_type, is_nullable == 'YES')
                 table.columns.append(column)
@@ -126,10 +127,12 @@ class Connection(Base):
 
         for constraint_name, (table_name, column_names) in constraints_dict.items():
             # get table
-            if table_name not in tables:
+            normalized_table_name = Table.normalize_name(table_name)
+
+            if normalized_table_name not in tables:
                 raise AssertionError(f'unknown table {table_name} for constraint {constraint_index}')
 
-            table = tables[table_name]
+            table = tables[normalized_table_name]
 
             # store constraint
             constraint = Constraint(
@@ -166,10 +169,12 @@ class Connection(Base):
 
         for constraint_name, (table_name, column_names) in constraints_dict.items():
             # get table
-            if table_name not in tables:
+            normalized_table_name = Table.normalize_name(table_name)
+
+            if normalized_table_name not in tables:
                 raise AssertionError(f'unknown table {table_name} for constraint {constraint_index}')
 
-            table = tables[table_name]
+            table = tables[normalized_table_name]
 
             # store constraint
             constraint = Constraint(
@@ -197,20 +202,23 @@ class Connection(Base):
                 raise AssertionError(f'could not parse foreign key definitions for table {source_table_name}')
 
             source_table_name = strip_delimiters(source_table_name)
+            normalized_source_table_name = Table.normalize_name(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))
+            normalized_target_table_name = Table.normalize_name(target_table_name)
             target_table_column_names = [strip_delimiters(c) for c in match.group(3).split(',')]
 
             # get tables
-            if source_table_name not in tables:
+            if normalized_source_table_name not in tables:
                 raise AssertionError(f'unknown table {source_table_name} for foreign key {fk_name}')
 
-            source_table = tables[source_table_name]
+            source_table = tables[normalized_source_table_name]
 
-            if target_table_name not in tables:
+            if normalized_target_table_name not in tables:
                 raise AssertionError(f'unknown table {target_table_name} for foreign key {fk_name}')
 
-            target_table = tables[target_table_name]
+            target_table = tables[normalized_target_table_name]
 
             # store constraint
             constraint = Constraint(

duckdb_kernel/db/implementation/sqlite/Connection.py

@@ -61,7 +61,7 @@ class Connection(Base):
                         WHERE type ='table' AND name NOT LIKE 'sqlite_%';
                     ''').fetchall():
                 table = Table(table_name)
-                tables[table_name] = table
+                tables[table.normalized_name] = table
 
             # Get column names and data types for each table.
             for table_name, table in tables.items():
@@ -174,8 +174,10 @@ class Connection(Base):
                         current_targets = []
 
                     # add columns to parse later
+                    normalized_to_table_name = Table.normalize_name(to_table_name)
+
                     current_sources.append(table.get_column(from_col))
-                    current_targets.append(tables[to_table_name].get_column(to_col))
+                    current_targets.append(tables[normalized_to_table_name].get_column(to_col))
 
                 if len(current_sources) > 0:
                     store()

duckdb_kernel/kernel.py

@@ -9,7 +9,7 @@ from typing import Optional, Dict, List, Tuple
 
 from ipykernel.kernelbase import Kernel
 
-from .db import Connection, DatabaseError
+from .db import Connection, DatabaseError, Table
 from .db.error import *
 from .magics import *
 from .parser import RAParser, DCParser
@@ -313,7 +313,7 @@ class DuckDBKernel(Kernel):
             for dc in data_columns:
                 found = 0
                 for i, rc in enumerate(result_columns):
-                    if dc == rc:
+                    if dc.lower() == rc.lower():
                         column_order.append(i)
                         found += 1
 
@@ -404,7 +404,7 @@ class DuckDBKernel(Kernel):
             whitelist = set()
 
             # split and strip names
-            names = [n.strip() for n in re.split(r'[, \t]', only)]
+            names = [Table.normalize_name(n.strip()) for n in re.split(r'[, \t]', only)]
 
             # add initial tables to result set
             for name in names:

duckdb_kernel/parser/elements/binary/ConditionalSet.py

@@ -116,7 +116,7 @@ class ConditionalSet:
         underscore_regex = re.compile(r'_{1,}')
 
         for operand_i, operand in enumerate(dc_operands):
-            source_columns = tables[operand.relation].columns
+            source_columns = tables[Table.normalize_name(operand.relation)].columns
 
             # Raise an exception if the given number of operands does not match
             # the number of attributes in the relation.

{jupyter_duckdb-1.2.0.1.dist-info → jupyter_duckdb-1.2.0.3.dist-info}/METADATA

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

{jupyter_duckdb-1.2.0.1.dist-info → jupyter_duckdb-1.2.0.3.dist-info}/RECORD

@@ -1,22 +1,22 @@
 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=wEEH7ZH7lbOvCa8NUe_5yuGT0P45Qg37NPzGT1-BMLc,19396
+duckdb_kernel/kernel.py,sha256=Td6S4qWDC9uuqgAhSllXwR-JHHdnGfT14RHkfYLzXxI,19441
 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
 duckdb_kernel/db/ForeignKey.py,sha256=iurUAXwTwSIpLXsL0B7BA8jqDTfW4_wkeHxoqQbZwiU,470
-duckdb_kernel/db/Table.py,sha256=6M_CTBV3QlrL_7CdYfu6s9LelXBQ5RdMUAyntE6xcDI,746
+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=znJ9mTbE4pjCLTVY_10PRAq_mv7NnxnnOuXOkKCNtSo,6395
+duckdb_kernel/db/implementation/duckdb/Connection.py,sha256=4zBgK9xYSV2m7tSl81kLOqGhByP7UhyCZxDuLVpZz7c,6817
 duckdb_kernel/db/implementation/duckdb/__init__.py,sha256=HKogB1es4wOiQUoh7_eT32xnUFLmzoCyR_0LuY9r8YQ,35
-duckdb_kernel/db/implementation/postgres/Connection.py,sha256=K8DRKJ5UyAJgRhMMIivhfUNzFIDarc_EmwCuRaPBGQ0,8810
+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=51I9G03PRLmreV2vlb7VVYjooAW13vlcFnimNuliLdo,6888
+duckdb_kernel/db/implementation/sqlite/Connection.py,sha256=L-aSUuN_7Z-hc5wczLjap2Xu-Vv6-dXmwXcN_WE8o98,6994
 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
@@ -40,7 +40,7 @@ duckdb_kernel/parser/elements/__init__.py,sha256=4DA2M43hh9d1fZb5Z6YnTTI-IBkDyhC
 duckdb_kernel/parser/elements/binary/Add.py,sha256=XGkZMfab01huk9EaI6JUfzkd2STbV1C_-TyC2guKE8I,190
 duckdb_kernel/parser/elements/binary/And.py,sha256=0jgetTG8yo5TJSeK70Kj-PI9ERyek1eyMQXX5HBxa4Y,274
 duckdb_kernel/parser/elements/binary/ArrowLeft.py,sha256=u4fZSoyT9lfvWXBwuhUl4DdjVZAOqyVIKmMVbpElLD4,203
-duckdb_kernel/parser/elements/binary/ConditionalSet.py,sha256=OKpUsTP3HzsDg0vVkb3JqWZd5AUL1RnZXmF-8qWoRq8,16649
+duckdb_kernel/parser/elements/binary/ConditionalSet.py,sha256=4KzvUTls2bodJw9ejCKx8se32PR5VFJbVupDZVx2NHE,16671
 duckdb_kernel/parser/elements/binary/Cross.py,sha256=jVY3cvD6qDWZkJ7q74lFUPO2VdDt4aAjdk2YAfg-ZC4,687
 duckdb_kernel/parser/elements/binary/Difference.py,sha256=ZVRgJHYVMOFwnc97oPvGtKvLvHsjSCsn2Aao6ymxY8Y,742
 duckdb_kernel/parser/elements/binary/Divide.py,sha256=d7mzaOeRYSRO1F-2IHsv_C939TuYtLppbf4-5GSRJXs,265
@@ -76,7 +76,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.1.dist-info/METADATA,sha256=1A3zmDclWZqxD2LMY8uYNUnkP3EksA263pFA_wmtXuo,7980
-jupyter_duckdb-1.2.0.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-jupyter_duckdb-1.2.0.1.dist-info/top_level.txt,sha256=KvRRPMnmkQNuhyBsXoPmwyt26LRDp0O-0HN6u0Dm5jA,14
-jupyter_duckdb-1.2.0.1.dist-info/RECORD,,
+jupyter_duckdb-1.2.0.3.dist-info/METADATA,sha256=O4AGOi_-WpenZIFXf6ZGNNPFGDWAHTNOYOA2CdEB4g0,7980
+jupyter_duckdb-1.2.0.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+jupyter_duckdb-1.2.0.3.dist-info/top_level.txt,sha256=KvRRPMnmkQNuhyBsXoPmwyt26LRDp0O-0HN6u0Dm5jA,14
+jupyter_duckdb-1.2.0.3.dist-info/RECORD,,