fix-template-processing

Author: LevisNgigi

superset/jinja_context.py

@@ -767,6 +767,10 @@ def process_template(self, sql: str, **kwargs: Any) -> str:
             raise SupersetTemplateException(
                 "Infinite recursion detected in template"
             ) from ex
+        except Exception as ex:
+            if "undefined" in str(ex).lower():
+                return sql
+            raise
 
 
 class JinjaTemplateProcessor(BaseTemplateProcessor):

superset/sqllab/query_render.py

@@ -74,6 +74,10 @@ def _validate(
         sql_template_processor: BaseTemplateProcessor,
     ) -> None:
         if is_feature_enabled("ENABLE_TEMPLATE_PROCESSING"):
+            original_sql = execution_context.query.sql.strip().strip(";")
+            if rendered_query == original_sql:
+                return
+
             syntax_tree = sql_template_processor.env.parse(rendered_query)
             undefined_parameters = find_undeclared_variables(syntax_tree)
             if undefined_parameters: