1515from sqlglot .schema import MappingSchema
1616from sqlmesh .cli .project_init import init_example_project , ProjectTemplate
1717from sqlmesh .core .environment import EnvironmentNamingInfo
18- from sqlmesh .core .renderer import TableMapping
18+ from sqlmesh .core .renderer import ExpressionRenderer , TableMapping
1919from sqlmesh .core .model .kind import TimeColumn , ModelKindName , SeedKind
2020
2121from sqlmesh import CustomMaterialization , CustomKind
@@ -9900,7 +9900,10 @@ def resolve_named(evaluator, name):
99009900 )
99019901
99029902
9903- def test_resolve_tables_expand_reveals_table_after_find_check (make_snapshot : t .Callable ):
9903+ @pytest .mark .parametrize ("use_cached_mapping" , [False , True ])
9904+ def test_resolve_tables_expand_reveals_table_after_find_check (
9905+ make_snapshot : t .Callable , use_cached_mapping : bool
9906+ ):
99049907 """Embedded-model expansion (`expand=`) runs as an `expression.transform` *before* the new
99059908 `expression.find(exp.Table)` short-circuit in `_resolve_tables`, so a table reference that
99069909 only exists *after* inlining an embedded model's query must still be seen by `find()` and
@@ -9909,6 +9912,8 @@ def test_resolve_tables_expand_reveals_table_after_find_check(make_snapshot: t.C
99099912 must still resolve to its physical table name, not be silently skipped because it wasn't
99109913 present at the time `_resolve_tables` was first called."""
99119914
9915+ from sqlmesh .core .snapshot import to_table_mapping
9916+
99129917 grandparent = load_sql_based_model (d .parse ("MODEL (name grandparent); SELECT 1 AS c" ))
99139918 grandparent_snapshot = make_snapshot (grandparent )
99149919 grandparent_snapshot .categorize_as (SnapshotChangeCategory .BREAKING )
@@ -9922,7 +9927,12 @@ def test_resolve_tables_expand_reveals_table_after_find_check(make_snapshot: t.C
99229927 child = load_sql_based_model (d .parse ("MODEL (name child); SELECT c FROM mid;" ))
99239928
99249929 snapshots = {'"grandparent"' : grandparent_snapshot , '"mid"' : mid_snapshot }
9925- query = child .render_query (snapshots = snapshots )
9930+ query = child .render_query (
9931+ snapshots = snapshots ,
9932+ render_table_mapping = (
9933+ TableMapping (to_table_mapping (snapshots .values (), None )) if use_cached_mapping else None
9934+ ),
9935+ )
99269936 assert query is not None
99279937 rendered_sql = query .sql ()
99289938
@@ -10071,6 +10081,28 @@ def items(self):
1007110081 assert ItemsCountingDict .items_call_count == 0
1007210082
1007310083
10084+ @pytest .mark .parametrize (
10085+ "dialect" ,
10086+ [
10087+ "duckdb,normalization_strategy=case_insensitive" ,
10088+ "snowflake,normalization_strategy=uppercase" ,
10089+ ],
10090+ )
10091+ def test_cached_table_mapping_preserves_key_order (dialect ):
10092+ # Updating an existing raw key must not move it after a later dialect-equivalent key.
10093+ table_mapping = {'"DB"."T"' : "early_table" , "DB.T" : "last_table" }
10094+ table_mapping .update ({'"DB"."T"' : "override_table" })
10095+ renderer = ExpressionRenderer (parse_one ("SELECT * FROM DB.T" , dialect = dialect ), dialect , [])
10096+
10097+ uncached = renderer .render (table_mapping = table_mapping )
10098+ cached = renderer .render (
10099+ table_mapping = table_mapping , render_table_mapping = TableMapping (table_mapping )
10100+ )
10101+
10102+ assert cached == uncached
10103+ assert exp .table_name (cached [0 ].find (exp .Table )) == "last_table"
10104+
10105+
1007410106def test_table_mapping_normalized_keys ():
1007510107 table_mapping = TableMapping ({'"db"."a"' : "view_a" , "db.A" : "view_a_upper" })
1007610108
@@ -10414,7 +10446,8 @@ def dummy_model_entry(evaluator: MacroEvaluator) -> exp.Select:
1041410446 assert len (context .engine_adapters ) == 2
1041510447
1041610448
10417- def test_model_on_virtual_update (make_snapshot : t .Callable ):
10449+ @pytest .mark .parametrize ("use_cached_mapping" , [False , True ])
10450+ def test_model_on_virtual_update (make_snapshot : t .Callable , use_cached_mapping : bool ):
1041810451 # Macro to test resolution within virtual statement
1041910452 @macro ()
1042010453 def resolve_parent_name (evaluator , name ):
@@ -10495,6 +10528,7 @@ def resolve_parent_name(evaluator, name):
1049510528 rendered_on_virtual_update = model .render_on_virtual_update (
1049610529 snapshots = snapshots ,
1049710530 table_mapping = table_mapping ,
10531+ render_table_mapping = TableMapping (table_mapping ) if use_cached_mapping else None ,
1049810532 this_model = model_snapshot .qualified_view_name .table_for_environment (
1049910533 environment_naming_info , dialect = dialect
1050010534 ),
@@ -10526,6 +10560,7 @@ def resolve_parent_name(evaluator, name):
1052610560 rendered_parent_on_virtual_update = parent .render_on_virtual_update (
1052710561 snapshots = snapshots ,
1052810562 table_mapping = table_mapping ,
10563+ render_table_mapping = TableMapping (table_mapping ) if use_cached_mapping else None ,
1052910564 this_model = parent_snapshot .qualified_view_name .table_for_environment (
1053010565 environment_naming_info , dialect = dialect
1053110566 ),
0 commit comments