fix-template-processing

Author: LevisNgigi

superset/jinja_context.py

@@ -696,6 +696,8 @@ def process_template(self, sql: str, **kwargs: Any) -> str:
         >>> process_template(sql)
         "SELECT '2017-01-01T00:00:00'"
         """
+        from jinja2 import UndefinedError
+
         try:
             template = self.env.from_string(sql)
         except (
@@ -767,6 +769,8 @@ def process_template(self, sql: str, **kwargs: Any) -> str:
             raise SupersetTemplateException(
                 "Infinite recursion detected in template"
             ) from ex
+        except UndefinedError:
+            return sql
         except Exception as ex:
             if "undefined" in str(ex).lower():
                 return sql

superset/sqllab/query_render.py

@@ -76,7 +76,11 @@ def _validate(
         if is_feature_enabled("ENABLE_TEMPLATE_PROCESSING"):
             original_sql = execution_context.query.sql.strip().strip(";")
             if rendered_query == original_sql:
-                return
+                import re
+
+                function_pattern = r"\{\{\s*(ref|source|var|env_var)\s*\("
+                if re.search(function_pattern, original_sql, re.IGNORECASE):
+                    return
 
             syntax_tree = sql_template_processor.env.parse(rendered_query)
             undefined_parameters = find_undeclared_variables(syntax_tree)