Fix yet another issue

Author: georgesittas

sqlmesh/core/model/common.py

@@ -236,20 +236,19 @@ def _add_variables_to_python_env(
         blueprint_variables=blueprint_variables,
     )
     for var_name, is_metadata in python_used_variables.items():
-        used_variables[var_name] = is_metadata and used_variables.get(var_name)
+        used_variables[var_name] = is_metadata and used_variables.get(var_name, True)
 
     # Variables are treated as metadata when:
     # - They are only referenced in metadata-only contexts, such as `audits (...)`, virtual statements, etc
     # - They are only referenced in metadata-only macros, either as their arguments or within their definitions
-    metadata_used_variables = set()
+    metadata_used_variables = {
+        var_name for var_name, is_metadata in used_variables.items() if is_metadata
+    }
     for used_var, outermost_macro_func in (outermost_macro_func_ancestor_by_var or {}).items():
         used_var_is_metadata = used_variables.get(used_var)
         if used_var_is_metadata is False:
             continue
-
-        if used_var_is_metadata or (
-            outermost_macro_func in python_env and python_env[outermost_macro_func].is_metadata
-        ):
+        if outermost_macro_func in python_env and python_env[outermost_macro_func].is_metadata:
             metadata_used_variables.add(used_var)
 
     non_metadata_used_variables = set(used_variables) - metadata_used_variables

tests/core/test_model.py

@@ -10119,8 +10119,8 @@ def m4_non_metadata_references_v6(evaluator):
     variables = python_env.get(c.SQLMESH_VARS)
     metadata_variables = python_env.get(c.SQLMESH_VARS_METADATA)
 
-    assert variables == Executable.value({"v1": 1, "v3": 3, "v6": 6})
-    assert metadata_variables == Executable.value({"v2": 2}, is_metadata=True)
+    assert variables == Executable.value({"v3": 3, "v6": 6})
+    assert metadata_variables == Executable.value({"v1": 1, "v2": 2}, is_metadata=True)
 
     blueprint_variables = python_env.get(c.SQLMESH_BLUEPRINT_VARS)
     blueprint_metadata_variables = python_env.get(c.SQLMESH_BLUEPRINT_VARS_METADATA)
@@ -10135,8 +10135,8 @@ def m4_non_metadata_references_v6(evaluator):
     assert macro_evaluator.locals == {
         "runtime_stage": "loading",
         "default_catalog": None,
-        c.SQLMESH_VARS: {"v1": 1, "v3": 3, "v6": 6},
-        c.SQLMESH_VARS_METADATA: {"v2": 2},
+        c.SQLMESH_VARS: {"v3": 3, "v6": 6},
+        c.SQLMESH_VARS_METADATA: {"v1": 1, "v2": 2},
         c.SQLMESH_BLUEPRINT_VARS: {"v4": exp.Literal.number("4")},
         c.SQLMESH_BLUEPRINT_VARS_METADATA: {"v5": exp.Literal.number("5")},
     }