pr feedback

Author: themisvaltinos

sqlmesh/core/model/kind.py

@@ -916,12 +916,6 @@ def data_hash_values(self) -> t.List[t.Optional[str]]:
             self.dialect,
         ]
 
-    @property
-    def metadata_hash_values(self) -> t.List[t.Optional[str]]:
-        return [
-            *super().metadata_hash_values,
-        ]
-
     def to_expression(
         self, expressions: t.Optional[t.List[exp.Expression]] = None, **kwargs: t.Any
     ) -> d.ModelKind:

sqlmesh/core/snapshot/evaluator.py

@@ -83,7 +83,7 @@
     format_additive_change_msg,
     AdditiveChangeError,
 )
-from sqlmesh.utils.jinja import JinjaMacroRegistry, MacroReturnVal
+from sqlmesh.utils.jinja import MacroReturnVal
 
 if sys.version_info >= (3, 12):
     from importlib import metadata
@@ -2685,9 +2685,7 @@ def _execute_materialization(
         create_only: bool = False,
         **kwargs: t.Any,
     ) -> None:
-        from sqlmesh.dbt.builtin import create_builtin_globals
-
-        jinja_macros = getattr(model, "jinja_macros", JinjaMacroRegistry())
+        jinja_macros = model.jinja_macros
         existing_globals = jinja_macros.global_objs.copy()
 
         # For vdes we need to use the table, since we don't know the schema/table at parse time
@@ -2709,8 +2707,8 @@ def _execute_materialization(
             "execution_dt": kwargs.get("execution_time"),
         }
 
-        context = create_builtin_globals(
-            jinja_macros=jinja_macros, jinja_globals=jinja_globals, engine_adapter=self.adapter
+        context = jinja_macros._create_builtin_globals(
+            {"engine_adapter": self.adapter, **jinja_globals}
         )
 
         context.update(
@@ -2731,7 +2729,7 @@ def _execute_materialization(
             try:
                 template.render(**context)
             except MacroReturnVal as ret:
-                # this is a succesful return from a macro call (dbt uses this list of Relations to update their relation cache)
+                # this is a successful return from a macro call (dbt uses this list of Relations to update their relation cache)
                 returned_relations = ret.value.get("relations", [])
                 logger.info(
                     f"Materialization {self.materialization_name} returned relations: {returned_relations}"

sqlmesh/dbt/manifest.py

@@ -136,7 +136,7 @@ def __init__(
 
         self._on_run_start_per_package: t.Dict[str, HookConfigs] = defaultdict(dict)
         self._on_run_end_per_package: t.Dict[str, HookConfigs] = defaultdict(dict)
-        self._materializations_per_package: t.Dict[str, MaterializationConfigs] = defaultdict(dict)
+        self._materializations: MaterializationConfigs = {}
 
     def tests(self, package_name: t.Optional[str] = None) -> TestConfigs:
         self._load_all()
@@ -166,9 +166,9 @@ def on_run_end(self, package_name: t.Optional[str] = None) -> HookConfigs:
         self._load_all()
         return self._on_run_end_per_package[package_name or self._project_name]
 
-    def materializations(self, package_name: t.Optional[str] = None) -> MaterializationConfigs:
+    def materializations(self) -> MaterializationConfigs:
         self._load_all()
-        return self._materializations_per_package[package_name or self._project_name]
+        return self._materializations
 
     @property
     def all_macros(self) -> t.Dict[str, t.Dict[str, MacroInfo]]:
@@ -315,9 +315,7 @@ def _load_materializations(self) -> None:
                     )
 
                     key = f"{mat_name}_{adapter}"
-                    self._materializations_per_package[macro.package_name][key] = (
-                        materialization_config
-                    )
+                    self._materializations[key] = materialization_config
 
     def _load_tests(self) -> None:
         for node in self._manifest.nodes.values():

sqlmesh/dbt/package.py

@@ -105,9 +105,7 @@ def load(self, package_root: Path) -> Package:
         models = _fix_paths(self._context.manifest.models(package_name), package_root)
         seeds = _fix_paths(self._context.manifest.seeds(package_name), package_root)
         macros = _fix_paths(self._context.manifest.macros(package_name), package_root)
-        materializations = _fix_paths(
-            self._context.manifest.materializations(package_name), package_root
-        )
+        materializations = _fix_paths(self._context.manifest.materializations(), package_root)
         on_run_start = _fix_paths(self._context.manifest.on_run_start(package_name), package_root)
         on_run_end = _fix_paths(self._context.manifest.on_run_end(package_name), package_root)
         sources = self._context.manifest.sources(package_name)