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

duckdb_kernel/db/Connection.py

@@ -10,6 +10,9 @@ class Connection:
     def close(self):
         pass
 
+    def copy(self) -> 'Connection':
+        raise NotImplementedError
+
     @staticmethod
     def plain_explain() -> bool:
         return False

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

@@ -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):
@@ -14,6 +15,9 @@ class Connection(Base):
     def close(self):
         self.con.close()
 
+    def copy(self) -> 'Connection':
+        return Connection(self.path)
+
     @staticmethod
     def plain_explain() -> bool:
         return True
@@ -36,7 +40,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:
@@ -59,7 +66,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 +78,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 +96,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 +112,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 +131,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 +147,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 +165,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

@@ -19,6 +19,7 @@ class Connection(Base):
         self.host: str = host
         self.port: int = port
         self.username: Optional[str] = username
+        self.password: Optional[str] = password
 
         options = {
             'host': host,
@@ -43,6 +44,9 @@ class Connection(Base):
     def close(self):
         self.con.close()
 
+    def copy(self) -> 'Connection':
+        return Connection(self.host, self.port, self.username, self.password, self.database_name)
+
     def __str__(self) -> str:
         user = f'{self.username}@' if self.username is not None else ''
         return f'PostgreSQL: {user}{self.host}:{self.port}/{self.database_name}'
@@ -63,7 +67,10 @@ class Connection(Base):
                 rows = cursor.fetchall()
             except psycopg.ProgrammingError as e:
                 text = str(e)
-                if text == "the last operation didn't produce a result":
+                if text.startswith((
+                        "the last operation didn't produce a result",
+                        "the last operation didn't produce records"
+                )):
                     raise EmptyResultError()
                 else:
                     raise e
@@ -88,7 +95,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 +107,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 +134,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 +176,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 +209,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

@@ -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):
@@ -15,6 +16,9 @@ class Connection(Base):
     def close(self):
         self.con.close()
 
+    def copy(self) -> 'Connection':
+        return Connection(self.path)
+
     @staticmethod
     def multiple_statements_per_query() -> bool:
         return False
@@ -41,7 +45,7 @@ class Connection(Base):
 
             # get columns
             if cursor.description is None:
-                columns = []
+                raise EmptyResultError()
             else:
                 columns = [e[0] for e in cursor.description]
 
@@ -61,7 +65,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 +178,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()