jupyter-duckdb 0.9.2.1.dev202311200802__py3-none-any.whl → 0.9.2.2__py3-none-any.whl

duckdb_kernel/parser/elements/RAOperand.py

@@ -22,10 +22,13 @@ class RAOperand(RAElement):
         yield
 
     def to_sql(self, tables: Dict[str, Table]) -> Tuple[str, RenamableColumnList]:
-        if self.relation not in tables:
+        table_keys = {key.lower(): key for key in tables}
+        relation_lower = self.relation.lower()
+
+        if relation_lower not in table_keys:
             raise AssertionError(f'unknown relation {self.relation}')
 
-        cols = RenamableColumnList.from_iter(tables[self.name].columns)
+        cols = RenamableColumnList.from_iter(tables[table_keys[relation_lower]].columns)
         column_names = ', '.join(c.rename() for c in cols)
 
         return f'SELECT DISTINCT {column_names} FROM {self.relation}', cols

duckdb_kernel/parser/elements/binary/ConditionalSet.py

@@ -149,9 +149,9 @@ class ConditionalSet:
         # names for the attributes. We store the related operands and the join conditions.
         # Furthermore, `select_columns` contains a mapping from column names to a part of
         # a "select as" statement and joined_columns is a list of all columns that were
-        # used for joins, so the resulting sql statement do not become ambiguous if they
+        # used for joins, so the resulting sql statements do not become ambiguous if they
         # are used for filtering.
-        positive_joins: List[Tuple[str, str, List[str]]] = []
+        positive_joins: List[Tuple[str, str, Optional[List[str]]]] = []
         select_columns: Dict[str, str] = {}
         joined_columns: RenamableColumnList = RenamableColumnList()
 
@@ -206,9 +206,22 @@ class ConditionalSet:
                         already_joined.add(join_tuple)
                         discovered_joins += 1
 
-                # If no joins were discovered using this table, an exception is raised.
+                # If no common attributes were discovered using this table,
+                # a cross join is used instead.
                 if discovered_joins == 0:
-                    raise AssertionError('no common attributes found for join')
+                    # Find any other table for the cross join, so the joins
+                    # can later be constructed.
+                    for right_name, _, _ in relevant_positive:
+                        if left_name != right_name:
+                            break
+                    else:
+                        raise AssertionError(f'could not build join for relation {left_name}')
+
+                    join_tuple = min(left_name, right_name), max(left_name, right_name)
+
+                    # Store the join with a join condition that is None.
+                    positive_joins.append((left_name, right_name, None))
+                    already_joined.add(join_tuple)
 
         # Last but not least we need to include the "negative" joins. They only
         # remove tuples and never add any attributes, so we only track the
@@ -249,12 +262,17 @@ class ConditionalSet:
         for _, target_name, join_condition in positive_joins:
             if target_name not in all_positive_conditions:
                 all_positive_conditions[target_name] = []
-            all_positive_conditions[target_name].extend(join_condition)
+            if join_condition is not None:
+                all_positive_conditions[target_name].extend(join_condition)
 
-        sorted_positive_joins: List[Tuple[str, str, str]] = []
+        sorted_positive_joins: List[Tuple[str, str, Optional[str]]] = []
         while len(used_relations) < len(relevant_positive):
             for source_name, target_name, _ in positive_joins:
-                join_condition = ' AND '.join(all_positive_conditions[target_name])
+                apc = all_positive_conditions[target_name]
+                if len(apc) == 0:
+                    join_condition = None
+                else:
+                    join_condition = ' AND '.join(apc)
 
                 if source_name in used_relations and target_name not in used_relations:
                     sorted_positive_joins.append((source_name, target_name, join_condition))
@@ -308,7 +326,10 @@ class ConditionalSet:
         sql_tables = table_statements[relevant_positive[0][0]]
         for _, target_name, join_condition in sorted_positive_joins:
             target_table_stmt = table_statements[target_name]
-            sql_tables += f' JOIN {target_table_stmt} ON {join_condition}'
+            if join_condition is None:
+                sql_tables += f' CROSS JOIN {target_table_stmt}'
+            else:
+                sql_tables += f' JOIN {target_table_stmt} ON {join_condition}'
         for _, target_name, join_condition, _ in sorted_negative_joins:
             target_table_stmt = table_statements[target_name]
             sql_tables += f' LEFT JOIN {target_table_stmt} ON {join_condition}'

{jupyter_duckdb-0.9.2.1.dev202311200802.dist-info → jupyter_duckdb-0.9.2.2.dist-info}/METADATA

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

{jupyter_duckdb-0.9.2.1.dev202311200802.dist-info → jupyter_duckdb-0.9.2.2.dist-info}/RECORD

@@ -28,14 +28,14 @@ duckdb_kernel/parser/elements/LogicOperand.py,sha256=B9NvriloQE5eP734dNMZBZwrdaa
 duckdb_kernel/parser/elements/LogicOperator.py,sha256=lkM4TAGkXUhsO4w4PLKVA0bgCRGPQQFpNA1FcWWOW9Q,1028
 duckdb_kernel/parser/elements/RABinaryOperator.py,sha256=XN41stGc1e-a4dZ1AQVtQ3lEgjUGNt3dMfYXp85LEeE,538
 duckdb_kernel/parser/elements/RAElement.py,sha256=gFnByFmDR34mo4nJa432c8tCE9AMPv9Gjn2fT3zL7_Y,1468
-duckdb_kernel/parser/elements/RAOperand.py,sha256=TOhRW5PVSJCCSdywm5Kqdvr7Trt7FXnTrmOQP7f6siA,950
+duckdb_kernel/parser/elements/RAOperand.py,sha256=pghnTYCrrT6MkvynJRgVFPRoMvxIGNB3FTjaq-uCpDQ,1078
 duckdb_kernel/parser/elements/RAOperator.py,sha256=rtqMFBIBBqT-Bwg7Qm4WQwbDrE28Nb74F_7XMeR3ks4,255
 duckdb_kernel/parser/elements/RAUnaryOperator.py,sha256=XC1nphkSm88JaEu5V_HKnb_8JNoeBfE3EvNL4o0qh2c,654
 duckdb_kernel/parser/elements/__init__.py,sha256=4DA2M43hh9d1fZb5Z6YnTTI-IBkDyhChSF5L9X3EA-s,547
 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=fMU-vq1Qr1kNxZNKwINi7cm9ak0yDfWj2leN2-7aE7A,15684
+duckdb_kernel/parser/elements/binary/ConditionalSet.py,sha256=wTum6yIspWjH3b_IDZBfD1DzG_xwKzpD_To9jBann_A,16643
 duckdb_kernel/parser/elements/binary/Cross.py,sha256=jVY3cvD6qDWZkJ7q74lFUPO2VdDt4aAjdk2YAfg-ZC4,687
 duckdb_kernel/parser/elements/binary/Difference.py,sha256=2oCdVm2dgd4Xh6ysLqqv1JgfNS_Bjtd8oA-kNBoFLf0,743
 duckdb_kernel/parser/elements/binary/Divide.py,sha256=d7mzaOeRYSRO1F-2IHsv_C939TuYtLppbf4-5GSRJXs,265
@@ -70,7 +70,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=fkp7tnyfzKQBXVI6X7efAvT8lczi_XlA7Hc_rhP_47s,2955
 duckdb_kernel/visualization/__init__.py,sha256=5eMJmxJ01XAXcgWDn3t70eSZF2PGaXdNo6GK-x-0H3s,78
-jupyter_duckdb-0.9.2.1.dev202311200802.dist-info/METADATA,sha256=KjKsudR_3JfIZ8I3MLccj6hoUqh_2s7p1gyMgW5XIVU,7764
-jupyter_duckdb-0.9.2.1.dev202311200802.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-jupyter_duckdb-0.9.2.1.dev202311200802.dist-info/top_level.txt,sha256=KvRRPMnmkQNuhyBsXoPmwyt26LRDp0O-0HN6u0Dm5jA,14
-jupyter_duckdb-0.9.2.1.dev202311200802.dist-info/RECORD,,
+jupyter_duckdb-0.9.2.2.dist-info/METADATA,sha256=fWbL4a6-vaQgGYki40Ur5fKVciw3Cizx2L-thNGVtX4,7748
+jupyter_duckdb-0.9.2.2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+jupyter_duckdb-0.9.2.2.dist-info/top_level.txt,sha256=KvRRPMnmkQNuhyBsXoPmwyt26LRDp0O-0HN6u0Dm5jA,14
+jupyter_duckdb-0.9.2.2.dist-info/RECORD,,

{jupyter_duckdb-0.9.2.1.dev202311200802.dist-info → jupyter_duckdb-0.9.2.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
+Generator: bdist_wheel (0.42.0)
 Root-Is-Purelib: true
 Tag: py3-none-any