Fix: Avoid using model aliases to produce versioned model names when loading dbt projects (#3150)

Author: izeigerman

sqlmesh/dbt/basemodel.py

@@ -184,9 +184,9 @@ def table_name(self) -> str:
     @property
     def config_name(self) -> str:
         """
-        Get the model's config name (package_name.alias)
+        Get the model's config name (package_name.name)
         """
-        return f"{self.package_name}.{self.alias}"
+        return f"{self.package_name}.{self.name}"
 
     def dialect(self, context: DbtContext) -> str:
         return self.dialect_ or context.default_dialect

sqlmesh/dbt/context.py

@@ -185,11 +185,14 @@ def refs(self) -> t.Dict[str, t.Union[ModelConfig, SeedConfig]]:
             for model in t.cast(
                 t.Dict[str, t.Union[ModelConfig, SeedConfig]], {**self._seeds, **self._models}
             ).values():
-                self._refs[model.alias or model.name] = model
-                self._refs[model.config_name] = model
-                if model.version is not None and model.version == model.latest_version:
-                    self._refs[model.name] = model
-                    self._refs[f"{model.package_name}.{model.name}"] = model
+                name = model.name
+                config_name = model.config_name
+                if model.version == model.latest_version:
+                    self._refs[name] = model
+                    self._refs[config_name] = model
+                if model.version:
+                    self._refs[f"{name}_v{model.version}"] = model
+                    self._refs[f"{config_name}_v{model.version}"] = model
         return self._refs
 
     @property

sqlmesh/dbt/manifest.py

@@ -229,6 +229,11 @@ def _load_models_and_seeds(self) -> None:
             )
             node_config = _node_base_config(node)
 
+            node_name = node.name
+            node_version = getattr(node, "version", None)
+            if node_version:
+                node_name = f"{node_name}_v{node_version}"
+
             if node.resource_type in {"model", "snapshot"}:
                 sql = node.raw_code if DBT_VERSION >= (1, 3) else node.raw_sql  # type: ignore
                 dependencies = Dependencies(
@@ -239,15 +244,14 @@ def _load_models_and_seeds(self) -> None:
                     self._flatten_dependencies_from_macros(dependencies.macros, node.package_name)
                 )
 
-                # Using the alias instead of the name because the alias captures the version of the model.
-                self._models_per_package[node.package_name][node.alias] = ModelConfig(
+                self._models_per_package[node.package_name][node_name] = ModelConfig(
                     sql=sql,
                     dependencies=dependencies,
                     tests=tests,
                     **node_config,
                 )
             else:
-                self._seeds_per_package[node.package_name][node.alias] = SeedConfig(
+                self._seeds_per_package[node.package_name][node_name] = SeedConfig(
                     dependencies=Dependencies(macros=macro_references),
                     tests=tests,
                     **node_config,