refactor: accept only table name strings in _resolve_table

Every caller of BaseExpressionRenderer._resolve_table passes a normalized
model name string: this_model resolution passes the model's FQN, and the
resolve_table macro normalizes its argument with normalize_model_name first.
The exp.Expr branch was reachable only from a test that called the private
method directly, so narrow the signature to str and delete that test.

Signed-off-by: mday-io <mdaytn@gmail.com>

Author: mday-io

sqlmesh/core/renderer.py

@@ -384,7 +384,7 @@ def update_cache(self, expression: t.Optional[exp.Expr]) -> None:
 
     def _resolve_table(
         self,
-        table_name: str | exp.Expr,
+        table_name: str,
         snapshots: t.Optional[t.Dict[str, Snapshot]] = None,
         table_mapping: t.Optional[t.Dict[str, str]] = None,
         deployability_index: t.Optional[DeployabilityIndex] = None,
@@ -405,7 +405,7 @@ def _resolve_table(
 
         if not mapping and snapshots:
             # An exact FQN match avoids scanning unrelated snapshots.
-            snapshot = snapshots.get(table_name) if isinstance(table_name, str) else None
+            snapshot = snapshots.get(table_name)
             # Keys normalized under different dialects may differ in casing or quoting.
             # Fall back to the full mapping so exp.replace_tables can reconcile them.
             mapping = self._to_table_mapping(

tests/core/test_model.py

@@ -9900,38 +9900,6 @@ def resolve_named(evaluator, name):
     )
 
 
-def test_resolve_table_non_string_expr_path(make_snapshot: t.Callable):
-    """When `table_name` is an `exp.Expr` (not a `str`), `_resolve_table` falls back to building
-    the full snapshot mapping (the `else` branch of the new code). This exercises that branch --
-    which the `this_model`/`resolve_table` macro call sites never hit, since they always pass a
-    pre-normalized string -- directly at the renderer level, to make sure it's still reachable
-    and correct, and not dead code that silently bit-rots."""
-
-    from sqlmesh.core.renderer import ExpressionRenderer
-
-    parent = load_sql_based_model(d.parse("MODEL (name parent); SELECT 1 AS c"))
-    parent_snapshot = make_snapshot(parent)
-    parent_snapshot.categorize_as(SnapshotChangeCategory.BREAKING)
-
-    other = load_sql_based_model(d.parse("MODEL (name other); SELECT 1 AS c"))
-    other_snapshot = make_snapshot(other)
-    other_snapshot.categorize_as(SnapshotChangeCategory.BREAKING)
-
-    expr_renderer = ExpressionRenderer(
-        exp.select("*"),
-        dialect="",
-        macro_definitions=[],
-        path=Path("."),
-    )
-
-    table_expr = exp.to_table('"parent"')
-    resolved = expr_renderer._resolve_table(
-        table_expr,
-        snapshots={'"parent"': parent_snapshot, '"other"': other_snapshot},
-    )
-    assert resolved.sql(comments=False) == f'"sqlmesh__default"."parent__{parent_snapshot.version}"'
-
-
 def test_resolve_tables_expand_reveals_table_after_find_check(make_snapshot: t.Callable):
     """Embedded-model expansion (`expand=`) runs as an `expression.transform` *before* the new
     `expression.find(exp.Table)` short-circuit in `_resolve_tables`, so a table reference that