Fix: Use the default dialect when constructing a table mapping key in the dbt adapter (#2853)

Author: izeigerman

sqlmesh/dbt/adapter.py

@@ -6,6 +6,7 @@
 
 import pandas as pd
 from sqlglot import exp, parse_one
+from sqlglot.optimizer.qualify_columns import quote_identifiers
 
 from sqlmesh.core.dialect import normalize_and_quote, normalize_model_name
 from sqlmesh.core.engine_adapter import EngineAdapter
@@ -323,7 +324,9 @@ def resolve_identifier(self, relation: BaseRelation) -> t.Optional[str]:
         return identifier if identifier else None
 
     def _map_table_name(self, table: exp.Table) -> exp.Table:
-        name = table.sql(dialect=self.project_dialect)
+        # Use the default dialect since this is the dialect used to normalize and quote keys in the
+        # mapping table.
+        name = quote_identifiers(table, dialect=self.project_dialect).sql()
         physical_table_name = self.table_mapping.get(name)
         if not physical_table_name:
             return table

tests/dbt/conftest.py

@@ -17,7 +17,7 @@ def sushi_test_project(sushi_test_dbt_context: Context) -> Project:
 @pytest.fixture()
 def runtime_renderer() -> t.Callable:
     def create_renderer(context: DbtContext, **kwargs: t.Any) -> t.Callable:
-        environment = context.jinja_macros.build_environment(**context.jinja_globals, **kwargs)
+        environment = context.jinja_macros.build_environment(**{**context.jinja_globals, **kwargs})
 
         def render(value: str) -> str:
             return environment.from_string(value).render()

tests/dbt/test_adapter.py

@@ -9,7 +9,7 @@
 from dbt.adapters.base import BaseRelation
 from dbt.adapters.base.column import Column
 from pytest_mock.plugin import MockerFixture
-from sqlglot import exp
+from sqlglot import exp, parse_one
 
 from sqlmesh import Context
 from sqlmesh.core.dialect import schema_
@@ -169,8 +169,12 @@ def test_adapter_dispatch(sushi_test_project: Project, runtime_renderer: t.Calla
         renderer("{{ adapter.dispatch('current_engine')() }}")
 
 
+@pytest.mark.parametrize("project_dialect", ["duckdb", "bigquery"])
 def test_adapter_map_snapshot_tables(
-    sushi_test_project: Project, runtime_renderer: t.Callable, mocker: MockerFixture
+    sushi_test_project: Project,
+    runtime_renderer: t.Callable,
+    mocker: MockerFixture,
+    project_dialect: str,
 ):
     snapshot_mock = mocker.Mock()
     snapshot_mock.name = '"memory"."test_db"."test_model"'
@@ -191,6 +195,7 @@ def test_adapter_map_snapshot_tables(
         test_model=BaseRelation.create(schema="test_db", identifier="test_model"),
         foo_bar=BaseRelation.create(schema="foo", identifier="bar"),
         default_catalog="memory",
+        dialect=project_dialect,
     )
 
     engine_adapter.create_schema("foo")
@@ -203,18 +208,24 @@ def test_adapter_map_snapshot_tables(
         table_name="foo.bar", columns_to_types={"col": exp.DataType.build("int")}
     )
 
+    expected_test_model_table_name = parse_one('"memory"."sqlmesh"."test_db__test_model"').sql(
+        dialect=project_dialect
+    )
+
     assert (
         renderer(
             "{{ adapter.get_relation(database=none, schema='test_db', identifier='test_model') }}"
         )
-        == '"memory"."sqlmesh"."test_db__test_model"'
+        == expected_test_model_table_name
     )
 
     assert "baz" in renderer("{{ run_query('SELECT * FROM test_db.test_model') }}")
 
+    expected_foo_bar_table_name = parse_one('"memory"."foo"."bar"').sql(dialect=project_dialect)
+
     assert (
         renderer("{{ adapter.get_relation(database=none, schema='foo', identifier='bar') }}")
-        == '"memory"."foo"."bar"'
+        == expected_foo_bar_table_name
     )
 
     assert renderer("{{ adapter.resolve_schema(test_model) }}") == "sqlmesh"