get CTE elim working

Author: JohnMount

data_algebra/db_model.py

@@ -1133,7 +1133,7 @@ def table_def_to_near_sql(
                 query_name=view_name,
                 quoted_query_name=self.quote_identifier(view_name),
                 sub_sql=subsql.to_bound_near_sql(columns=using),
-                ops_key=f"table({table_def.node_name}, {terms.keys()})",
+                ops_key=f"table({table_def.table_name}, {terms.keys()})",
             )
         return near_sql
 

data_algebra/near_sql.py

@@ -204,7 +204,9 @@ def to_with_form_stub(
             assert isinstance(v[1], NearSQLContainer)
         if not stub.is_table:
             # first check cache
-            ops_key = f"{self.near_sql.ops_key}_{self.columns}"
+            ops_key = f"{self.near_sql.ops_key}"
+            if self.columns is not None:
+                ops_key = f"{ops_key}_{list(self.columns)}"
             if (cte_cache is not None) and (ops_key is not None):
                 try:
                     retrieved_cte = cte_cache[ops_key]

data_algebra/sql_format_options.py

@@ -15,7 +15,7 @@ class SQLFormatOptions(SimpleNamespace):
     :param initial_commas: bool = False, if True write initial commas instead of after commas
     :param warn_on_method_support: bool = True, if True warn on translation to untrusted methods
     :param warn_on_novel_methods: bool = True, if True warn on translation to unrecognized methods
-    :param use_cte_elim: bool = False, if True optimzie SQL by re-using common table expressions (experimental! NOT WORKING YET)
+    :param use_cte_elim: bool = False, if True optimize SQL by re-using common table expressions (experimental)
     """
 
     def __init__(
@@ -37,7 +37,7 @@ def __init__(
         :param initial_commas: bool = False, if True write initial commas instead of after commas
         :param warn_on_method_support: bool = True, if True warn on translation to untrusted methods
         :param warn_on_novel_methods: bool = True, if True warn on translation to unrecognized methods
-        :param use_cte_elim: bool = False, if True optimize SQL by re-using common table expressions (experimental! NOT WORKING YET)
+        :param use_cte_elim: bool = False, if True optimize SQL by re-using common table expressions (experimental)
         """
         assert isinstance(use_with, bool)
         assert isinstance(annotate, bool)

data_algebra/test_util.py

@@ -413,7 +413,7 @@ def check_transform_on_handles(
             for initial_commas in [True, False]:
                 for use_with in [True, False]:
                     for annotate in [True, False]:
-                        for use_cte_elim in [False]:  #  [True, False]:  # TODO: put back
+                        for use_cte_elim in [True, False]:
                             sql_format_options = SQLFormatOptions(
                                 use_with=use_with,
                                 annotate=annotate,

tests/test_sqlite_joins.py

@@ -94,6 +94,16 @@ def test_sqlite_joins_simulate_full_join():
         .natural_join(b=descr(d1=d1), by=join_columns, jointype="left")
         .natural_join(b=descr(d2=d2), by=join_columns, jointype="left")
     )
+    db_model = data_algebra.BigQuery.BigQueryModel()
+    sql = db_model.to_sql(
+        ops_simulate,
+        sql_format_options=data_algebra.sql_format_options.SQLFormatOptions(
+            use_with=True,
+            annotate=False,
+            use_cte_elim=True,
+        )
+    )
+    assert isinstance(sql, str)
     data_algebra.test_util.check_transform(
         ops=ops_simulate,
         data={"d1": d1, "d2": d2},