Skip to content

Commit 927c14d

Browse files
committed
remove virtual_environment_mode field_validator
1 parent 8b4eae4 commit 927c14d

File tree

2 files changed

+5
-30
lines changed

2 files changed

+5
-30
lines changed

sqlmesh/core/model/meta.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -332,11 +332,11 @@ def ignored_rules_validator(cls, vs: t.Any) -> t.Any:
332332

333333
@field_validator("grants_target_layer", mode="before")
334334
def _grants_target_layer_validator(cls, v: t.Any) -> t.Any:
335-
return cls._validate_str_enum_value(v)
336-
337-
@field_validator("virtual_environment_mode", mode="before")
338-
def _virtual_environment_mode_validator(cls, v: t.Any) -> t.Any:
339-
return cls._validate_str_enum_value(v)
335+
if isinstance(v, exp.Identifier):
336+
return v.this
337+
if isinstance(v, exp.Literal) and v.is_string:
338+
return v.this
339+
return v
340340

341341
@field_validator("session_properties_", mode="before")
342342
def session_properties_validator(cls, v: t.Any, info: ValidationInfo) -> t.Any:

tests/core/test_model.py

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1953,7 +1953,6 @@ def test_render_definition_with_grants():
19531953
'insert' = ['admin'],
19541954
'roles/bigquery.dataViewer' = ['user:[email protected]']
19551955
),
1956-
virtual_environment_mode dev_only,
19571956
grants_target_layer all,
19581957
);
19591958
SELECT 1 as id
@@ -2024,30 +2023,6 @@ def test_render_definition_with_grants():
20242023
default_model = load_sql_based_model(default_expressions)
20252024
assert default_model.grants_target_layer == GrantsTargetLayer.ALL # default value
20262025

2027-
# Test round-trip: parse model with grants_target_layer, render definition, parse back
2028-
original_expressions = d.parse(
2029-
"""
2030-
MODEL (
2031-
name test.roundtrip_model,
2032-
kind FULL,
2033-
grants (
2034-
'select' = ['user1', 'user2'],
2035-
'insert' = ['admin']
2036-
),
2037-
grants_target_layer 'virtual'
2038-
);
2039-
SELECT 1 as id
2040-
"""
2041-
)
2042-
original_model = load_sql_based_model(original_expressions)
2043-
rendered_def = original_model.render_definition(include_defaults=True)
2044-
rendered_text = d.format_model_expressions(rendered_def)
2045-
reparsed_expressions = d.parse(rendered_text)
2046-
reparsed_model = load_sql_based_model(reparsed_expressions)
2047-
2048-
assert reparsed_model.grants_target_layer == GrantsTargetLayer.VIRTUAL
2049-
assert reparsed_model.grants == original_model.grants
2050-
20512026

20522027
def test_render_definition_partitioned_by():
20532028
# no parenthesis in definition, no parenthesis when rendered

0 commit comments

Comments
 (0)