revert jinja version, implement tojson hack (#572)

dbt/context/common.py

@@ -233,13 +233,18 @@ def fn(string):
     return fn
 
 
-def fromjson(node):
-    def fn(string, default=None):
-        try:
-            return json.loads(string)
-        except ValueError as e:
-            return default
-    return fn
+def fromjson(string, default=None):
+    try:
+        return json.loads(string)
+    except ValueError as e:
+        return default
+
+
+def tojson(value, default=None):
+    try:
+        return json.dumps(value)
+    except ValueError as e:
+        return default
 
 
 def _return(value):
@@ -290,7 +295,8 @@ def generate(model, project, flat_graph, provider=None):
         "schema": model.get('schema', schema),
         "sql": model.get('injected_sql'),
         "sql_now": adapter.date_function(),
-        "fromjson": fromjson(model),
+        "fromjson": fromjson,
+        "tojson": tojson,
         "target": target,
         "this": dbt.utils.Relation(profile, adapter, model, use_temp=True)
     })

dbt/include/global_project/macros/materializations/helpers.sql

@@ -22,7 +22,7 @@
 
 
 {% macro make_hook_config(sql, inside_transaction) %}
-    {{ {"sql": sql, "transaction": inside_transaction} | tojson }}
+    {{ tojson({"sql": sql, "transaction": inside_transaction}) }}
 {% endmacro %}
 
 

requirements.txt

@@ -1,5 +1,5 @@
 argparse>=1.2.1
-Jinja2>=2.9
+Jinja2>=2.8
 PyYAML>=3.11
 psycopg2==2.7.1
 sqlparse==0.2.3

setup.py

@@ -31,7 +31,7 @@
         'scripts/dbt',
     ],
     install_requires=[
-        'Jinja2>=2.9',
+        'Jinja2>=2.8',
         'PyYAML>=3.11',
         'psycopg2==2.7.1',
         'sqlparse==0.2.3',