hotfix: execution in named cells was breaking (#172)

* fix: replace % with %% to handle python logic

* fix: hanging macro names led to failed execution

* chore: advance python version

* chore: advance rust version

cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "whale"
-version = "2.1.0-b0"
+version = "2.1.0-b1"
 authors = ["Robert Yi <[email protected]>"]
 edition = "2018"
 

pipelines/setup.py

@@ -8,7 +8,7 @@
 
 setuptools.setup(
     name="whale-pipelines",
-    version="2.l.0b0",
+    version="2.l.0b1",
     author="Robert Yi",
     author_email="[email protected]",
     description="A pared-down metadata scraper + SQL runner.",

pipelines/whale/__init__.py

@@ -199,6 +199,7 @@ def run(sql, warehouse_name=None, extra_macros: str = "") -> pd.DataFrame:
         sql, connection_name=connection.name, extra_macros=extra_macros
     )
     LOGGER.info(f"Templated query:\n{sql}")
+    sql = sql.replace("%", "%%")
 
     result = engine.execute(sql, has_header=True)
     headers = next(result)

pipelines/whale/utils/parsers.py

@@ -154,9 +154,13 @@ def construct_jinja_statement(clause):
     sections = []
     for clause in splits:
         if state == IN_BLOCK:
-            processed_clause = function_to_apply_to_block(
-                clause, **function_kwargs, extra_macros=extra_macros
+            split_clause = clause.split("\n")
+            prefix = split_clause[0]
+            sql = "\n".join(split_clause[1:])
+            processed_sql = function_to_apply_to_block(
+                sql, **function_kwargs, extra_macros=extra_macros
             )
+            processed_clause = "\n".join([prefix, processed_sql])
             state = OUT_OF_BLOCK
         else:
             processed_clause = clause