Revert "Fix: redshift leverages postgres adapter dispatch implementations for common functionality" (#2836)

Author: izeigerman

sqlmesh/dbt/adapter.py

@@ -97,27 +97,15 @@ def quote(self, identifier: str) -> str:
 
     def dispatch(self, name: str, package: t.Optional[str] = None) -> t.Callable:
         """Returns a dialect-specific version of a macro with the given name."""
-        package = package or "dbt"
         target_type = self.jinja_globals["target"]["type"]
-        macro_suffix = f"__{name}"
-
-        def _relevance(macro: MacroReference) -> int:
-            """Lower scores more relevant."""
-            if macro.name.startswith("default"):
-                return 2
-            elif macro.name.startswith(target_type):
-                return 0
-            return 1
-
-        macros = [
-            MacroReference(package=macro_package, name=macro_name)
-            for macro_package, macros in self.jinja_macros.packages.items()
-            if (macro_package == package) or (package == "dbt" and macro_package.startswith("dbt_"))
-            for macro_name in macros.keys()
-            if macro_name.endswith(macro_suffix)
+        references_to_try = [
+            MacroReference(package=f"{package}_{target_type}", name=f"{target_type}__{name}"),
+            MacroReference(package=package, name=f"{target_type}__{name}"),
+            MacroReference(package=package, name=f"default__{name}"),
         ]
-        for macro in sorted(macros, key=_relevance):
-            macro_callable = self.jinja_macros.build_macro(macro, **self.jinja_globals)
+
+        for reference in references_to_try:
+            macro_callable = self.jinja_macros.build_macro(reference, **self.jinja_globals)
             if macro_callable is not None:
                 return macro_callable
 

tests/dbt/test_adapter.py

@@ -164,13 +164,9 @@ def test_adapter_dispatch(sushi_test_project: Project, runtime_renderer: t.Calla
     context = sushi_test_project.context
     renderer = runtime_renderer(context)
     assert renderer("{{ adapter.dispatch('current_engine', 'customers')() }}") == "duckdb"
-    assert renderer("{{ adapter.dispatch('current_timestamp')() }}") == "now()"
-    assert renderer("{{ adapter.dispatch('current_timestamp', 'dbt')() }}") == "now()"
 
     with pytest.raises(ConfigError, match=r"Macro 'current_engine'.*was not found."):
         renderer("{{ adapter.dispatch('current_engine')() }}")
-    with pytest.raises(ConfigError, match=r"Macro 'current_timestamp'.*was not found."):
-        assert renderer("{{ adapter.dispatch('current_timestamp', 'customers')() }}")
 
 
 def test_adapter_map_snapshot_tables(