correcting style and windows tests

Author: Fynes

sqlmesh/core/macros.py

@@ -271,7 +271,8 @@ def _load_python_env(self) -> None:
                     self.env[executable.alias] = self.env[executable.name]
                 # Register as macro if it's a macro definition
                 func_name = executable.name or name
-                self.macros[normalize_macro_name(name)] = self.env[func_name]
+                self.macros[normalize_macro_name(
+                    func_name)] = self.env[func_name]
             elif executable.is_import:
                 self._unloaded_executables[name] = executable
 
@@ -298,10 +299,13 @@ def _ensure_executable_loaded(self, name: str) -> bool:
                 self.env[executable.alias] = self.env[executable.name]
 
             # If it's a macro import, register it
+            # For imports, the actual imported name might differ from the key
+            imported_name = executable.name or name
             if executable.is_import and getattr(
-                self.env.get(name), c.SQLMESH_MACRO, None
+                self.env.get(imported_name), c.SQLMESH_MACRO, None
             ):
-                self.macros[normalize_macro_name(name)] = self.env[name]
+                self.macros[normalize_macro_name(
+                    imported_name)] = self.env[imported_name]
 
             del self._unloaded_executables[name]
             return True

tests/core/test_macros.py

@@ -1254,14 +1254,11 @@ def test_lazy_macro_loading_success():
 
     evaluator = MacroEvaluator(python_env=python_env)
 
-    # The import should be deferred, not loaded yet
     assert "math_module" in evaluator._unloaded_executables
 
-    # Now try to access math_module
     assert evaluator._ensure_executable_loaded("math_module")
 
-    # After loading, it should be available
-    assert "math_module" in evaluator.env
+    assert "math" in evaluator.env
     assert "math_module" not in evaluator._unloaded_executables