Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions sqlmesh/core/renderer.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
from sqlmesh.utils.date import TimeLike, date_dict, make_inclusive, to_datetime
from sqlmesh.utils.errors import (
ConfigError,
MacroEvalError,
ParsetimeAdapterCallError,
SQLMeshError,
raise_config_error,
Expand Down Expand Up @@ -198,7 +197,7 @@ def _render(
for definition in self._macro_definitions:
try:
macro_evaluator.evaluate(definition)
except MacroEvalError as ex:
except Exception as ex:
raise_config_error(f"Failed to evaluate macro '{definition}'. {ex}", self._path)

macro_evaluator.locals.update(render_kwargs)
Expand All @@ -211,8 +210,11 @@ def _render(
for expression in expressions:
try:
transformed_expressions = ensure_list(macro_evaluator.transform(expression))
except MacroEvalError as ex:
raise_config_error(f"Failed to resolve macro for expression. {ex}", self._path)
except Exception as ex:
raise_config_error(
f"Failed to resolve macros for\n{expression.sql(dialect=self._dialect, pretty=True)}\n{ex}",
self._path,
)

for expression in t.cast(t.List[exp.Expression], transformed_expressions):
with self._normalize_and_quote(expression) as expression:
Expand Down