Fix: Include root package in search candidates when resolving dbt macros (#5349)

Author: vchan

sqlmesh/dbt/adapter.py

@@ -139,10 +139,15 @@ def _relevance(package_name_pair: t.Tuple[t.Optional[str], str]) -> t.Tuple[int,
             return name_score, package_score
 
         jinja_env = self.jinja_macros.build_environment(**self.jinja_globals).globals
-        packages_to_check: t.List[t.Optional[str]] = [
-            macro_namespace,
-            *(k for k in jinja_env if k.startswith("dbt")),
-        ]
+
+        packages_to_check: t.List[t.Optional[str]] = [None]
+        if macro_namespace is not None:
+            if macro_namespace in jinja_env:
+                packages_to_check = [self.jinja_macros.root_package_name, macro_namespace]
+
+        # Add dbt packages as fallback
+        packages_to_check.extend(k for k in jinja_env if k.startswith("dbt"))
+
         candidates = {}
         for macro_package in packages_to_check:
             macros = jinja_env.get(macro_package, {}) if macro_package else jinja_env

tests/dbt/test_adapter.py

@@ -242,6 +242,7 @@ def test_adapter_dispatch(sushi_test_project: Project, runtime_renderer: t.Calla
     assert renderer("{{ adapter.dispatch('current_engine', 'customers')() }}") == "duckdb"
     assert renderer("{{ adapter.dispatch('current_timestamp')() }}") == "now()"
     assert renderer("{{ adapter.dispatch('current_timestamp', 'dbt')() }}") == "now()"
+    assert renderer("{{ adapter.dispatch('select_distinct', 'customers')() }}") == "distinct"
 
     # test with keyword arguments
     assert (

tests/fixtures/dbt/sushi_test/macros/distinct.sql

@@ -0,0 +1 @@
+{% macro default__select_distinct() %}distinct{% endmacro %}