File tree Expand file tree Collapse file tree 2 files changed +5
-30
lines changed Expand file tree Collapse file tree 2 files changed +5
-30
lines changed Original file line number Diff line number Diff line change @@ -332,11 +332,11 @@ def ignored_rules_validator(cls, vs: t.Any) -> t.Any:
332
332
333
333
@field_validator ("grants_target_layer" , mode = "before" )
334
334
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
340
340
341
341
@field_validator ("session_properties_" , mode = "before" )
342
342
def session_properties_validator (cls , v : t .Any , info : ValidationInfo ) -> t .Any :
Original file line number Diff line number Diff line change @@ -1953,7 +1953,6 @@ def test_render_definition_with_grants():
1953
1953
'insert' = ['admin'],
1954
1954
'roles/bigquery.dataViewer' = ['user:[email protected] ']
1955
1955
),
1956
- virtual_environment_mode dev_only,
1957
1956
grants_target_layer all,
1958
1957
);
1959
1958
SELECT 1 as id
@@ -2024,30 +2023,6 @@ def test_render_definition_with_grants():
2024
2023
default_model = load_sql_based_model (default_expressions )
2025
2024
assert default_model .grants_target_layer == GrantsTargetLayer .ALL # default value
2026
2025
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
-
2051
2026
2052
2027
def test_render_definition_partitioned_by ():
2053
2028
# no parenthesis in definition, no parenthesis when rendered
You can’t perform that action at this time.
0 commit comments