de-couple types of to_pyton style calls by having consumers call str() on them

Author: JohnMount

data_algebra/MySQL.py

@@ -43,7 +43,7 @@ def _MySQL_concat_expr(dbmodel, expression):
 
 # map from op-name to special SQL formatting code
 MySQL_formatters = {
-    "___": lambda dbmodel, expression: expression.to_python(),
+    "___": lambda dbmodel, expression: str(expression.to_python()),
     "is_bad": _MySQL_is_bad_expr,
     "concat": _MySQL_concat_expr,
 }

data_algebra/PostgreSQL.py

@@ -14,7 +14,7 @@
 
 # map from op-name to special SQL formatting code
 PostgreSQL_formatters = {
-    "___": lambda dbmodel, expression: expression.to_python(),
+    "___": lambda dbmodel, expression: str(expression.to_python()),
 }
 
 

data_algebra/SparkSQL.py

@@ -55,7 +55,7 @@ def coalesce_step(x):
 
 # map from op-name to special SQL formatting code
 SparkSQL_formatters = {
-    "___": lambda dbmodel, expression: expression.to_python(),
+    "___": lambda dbmodel, expression: str(expression.to_python()),
     "is_bad": _sparksql_is_bad_expr,
     "coalesce": _sparksql_coalesce_expr,
 }

data_algebra/db_model.py

@@ -879,9 +879,9 @@ def extend_to_sql(
             oi.get_column_names(cols_used_in_term)
             cols_used_in_term.update(window_vars)
             declared_term_dependencies[ci] = cols_used_in_term
-        annotation = extend_node.to_python_implementation(
+        annotation = str(extend_node.to_python_implementation(
             print_sources=False, indent=-1
-        )
+        ))
         # TODO: see if we can merge with subsql instead of building a new one
         if (
             self.allow_extend_merges
@@ -978,9 +978,9 @@ def project_to_sql(
             quoted_query_name=self.quote_identifier(view_name),
             sub_sql=subsql.to_bound_near_sql(columns=subusing),
             suffix=suffix,
-            annotation=project_node.to_python_implementation(
+            annotation=str(project_node.to_python_implementation(
                 print_sources=False, indent=-1
-            ),
+            )),
         )
         return near_sql
 
@@ -1018,9 +1018,9 @@ def select_rows_to_sql(
             quoted_query_name=self.quote_identifier(view_name),
             sub_sql=subsql.to_bound_near_sql(columns=subusing),
             suffix=suffix,
-            annotation=select_rows_node.to_python_implementation(
+            annotation=str(select_rows_node.to_python_implementation(
                 print_sources=False, indent=-1
-            ),
+            )),
         )
         return near_sql
 
@@ -1127,9 +1127,9 @@ def order_to_sql(
             quoted_query_name=self.quote_identifier(view_name),
             sub_sql=subsql.to_bound_near_sql(columns=subusing),
             suffix=suffix,
-            annotation=order_node.to_python_implementation(
+            annotation=str(order_node.to_python_implementation(
                 print_sources=False, indent=-1
-            ),
+            )),
         )
         return near_sql
 
@@ -1162,9 +1162,9 @@ def rename_to_sql(
             terms=terms,
             quoted_query_name=self.quote_identifier(view_name),
             sub_sql=subsql.to_bound_near_sql(columns=subusing),
-            annotation=rename_node.to_python_implementation(
+            annotation=str(rename_node.to_python_implementation(
                 print_sources=False, indent=-1
-            ),
+            )),
         )
         return near_sql
 
@@ -1259,9 +1259,9 @@ def natural_join_to_sql(
             joiner=jointype + " JOIN",
             sub_sql2=sql_right.to_bound_near_sql(columns=using_right, force_sql=False),
             suffix=on_terms,
-            annotation=join_node.to_python_implementation(
+            annotation=str(join_node.to_python_implementation(
                 print_sources=False, indent=-1
-            ),
+            )),
         )
         return near_sql
 
@@ -1315,9 +1315,9 @@ def concat_rows_to_sql(
             sub_sql2=sql_right.to_bound_near_sql(
                 columns=using_left, force_sql=True, constants=constants_right,
             ),
-            annotation=concat_node.to_python_implementation(
+            annotation=str(concat_node.to_python_implementation(
                 print_sources=False, indent=-1
-            ),
+            )),
         )
         return near_sql