Skip to content
Merged
Show file tree
Hide file tree
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
5 changes: 2 additions & 3 deletions sqlmesh/utils/metaprogramming.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,8 @@ def func_globals(func: t.Callable) -> t.Dict[str, t.Any]:
for var in (
arg_globals + list(_code_globals(code)) + decorator_vars(func, root_node=root_node)
):
ref = func.__globals__.get(var)
if ref:
variables[var] = ref
if var in func.__globals__:
variables[var] = func.__globals__[var]

if func.__closure__:
for var, value in zip(code.co_freevars, func.__closure__):
Expand Down
9 changes: 6 additions & 3 deletions tests/utils/test_metaprogramming.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ def test_fun\(\):
X = 1
Y = 2
Z = 3
W = 0

my_lambda = lambda: print("z") # noqa: E731

Expand Down Expand Up @@ -96,7 +97,7 @@ def other_func(a: int) -> int:
pd.DataFrame([{"x": 1}])
to_table("y")
my_lambda() # type: ignore
return X + a
return X + a + W


def noop_metadata() -> None:
Expand Down Expand Up @@ -165,6 +166,7 @@ def test_func_globals() -> None:
}
assert func_globals(other_func) == {
"X": 1,
"W": 0,
"my_lambda": my_lambda,
"pd": pd,
"to_table": to_table,
Expand Down Expand Up @@ -212,7 +214,7 @@ def closure(z: int):
pd.DataFrame([{'x': 1}])
to_table('y')
my_lambda()
return X + a"""
return X + a + W"""
)


Expand Down Expand Up @@ -256,6 +258,7 @@ def closure(z: int):
"X": Executable(payload="1", kind=ExecutableKind.VALUE),
"Y": Executable(payload="2", kind=ExecutableKind.VALUE),
"Z": Executable(payload="3", kind=ExecutableKind.VALUE),
"W": Executable(payload="0", kind=ExecutableKind.VALUE),
"_GeneratorContextManager": Executable(
payload="from contextlib import _GeneratorContextManager", kind=ExecutableKind.IMPORT
),
Expand Down Expand Up @@ -336,7 +339,7 @@ def test_context_manager():
pd.DataFrame([{'x': 1}])
to_table('y')
my_lambda()
return X + a""",
return X + a + W""",
),
"test_context_manager": Executable(
payload="""@contextmanager
Expand Down