Skip to content

Commit b2ef0bd

Browse files
newtonapplenewtonapple
committed
Change default grants_target_layer to VIRTUAL
1 parent 9f2f9ba commit b2ef0bd

5 files changed

Lines changed: 37 additions & 21 deletions

File tree

‎sqlmesh/core/model/meta.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class GrantsTargetLayer(str, Enum):
6262

6363
@classproperty
6464
def default(cls) -> "GrantsTargetLayer":
65-
return GrantsTargetLayer.ALL
65+
return GrantsTargetLayer.VIRTUAL
6666

6767
@property
6868
def is_all(self) -> bool:

‎tests/core/engine_adapter/integration/test_integration_postgres.py‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,8 @@ def test_grants_plan(engine_adapter: PostgresEngineAdapter, ctx: TestContext, tm
475475
kind FULL,
476476
grants (
477477
'select' = ['test_analyst']
478-
)
478+
),
479+
grants_target_layer 'all'
479480
);
480481
SELECT 1 as id, CURRENT_DATE as created_date
481482
"""
@@ -510,7 +511,8 @@ def test_grants_plan(engine_adapter: PostgresEngineAdapter, ctx: TestContext, tm
510511
grants (
511512
'select' = ['test_analyst', 'test_etl_user'],
512513
'insert' = ['test_etl_user']
513-
)
514+
),
515+
grants_target_layer 'all'
514516
);
515517
SELECT 1 as id, CURRENT_DATE as created_date, 'v2' as version
516518
"""
@@ -636,7 +638,8 @@ def test_grants_plan_full_refresh_model_via_replace(
636638
kind FULL,
637639
grants (
638640
'SELECT' = ['{roles["reader"]["username"]}']
639-
)
641+
),
642+
grants_target_layer 'all'
640643
);
641644
SELECT 1 as id, 'test_data' as status
642645
"""
@@ -683,7 +686,8 @@ def test_grants_plan_incremental_model_first_insert(
683686
),
684687
grants (
685688
'SELECT' = ['{roles["reader"]["username"]}']
686-
)
689+
),
690+
grants_target_layer 'all'
687691
);
688692
689693
SELECT 1 as id, @start_ds::timestamp as ts, 'data' as value
@@ -727,7 +731,8 @@ def test_grants_plan_clone_environment(
727731
kind FULL,
728732
grants (
729733
'SELECT' = ['{roles["reader"]["username"]}']
730-
)
734+
),
735+
grants_target_layer 'all'
731736
);
732737
733738
SELECT 1 as id, 'data' as value
@@ -783,7 +788,8 @@ def test_grants_metadata_only_changes(
783788
kind FULL,
784789
grants (
785790
'select' = ['{roles["reader"]["username"]}']
786-
)
791+
),
792+
grants_target_layer 'all'
787793
);
788794
SELECT 1 as id, 'unchanged_query' as data
789795
"""
@@ -817,7 +823,8 @@ def test_grants_metadata_only_changes(
817823
grants (
818824
'select' = ['{roles["writer"]["username"]}', '{roles["admin"]["username"]}'],
819825
'insert' = ['{roles["admin"]["username"]}']
820-
)
826+
),
827+
grants_target_layer 'all'
821828
);
822829
SELECT 1 as id, 'unchanged_query' as data
823830
"""
@@ -851,7 +858,8 @@ def test_grants_metadata_only_changes(
851858
kind FULL,
852859
grants (
853860
'select' = ['{roles["reader"]["username"]}']
854-
)
861+
),
862+
grants_target_layer 'all'
855863
);
856864
SELECT 1 as id, 'unchanged_query' as data
857865
"""

‎tests/core/test_model.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1927,7 +1927,7 @@ def test_render_definition_with_defaults():
19271927
materialized FALSE
19281928
),
19291929
virtual_environment_mode 'full',
1930-
grants_target_layer 'all'
1930+
grants_target_layer 'virtual'
19311931
);
19321932
19331933
{query}
@@ -2021,7 +2021,7 @@ def test_render_definition_with_grants():
20212021
"""
20222022
)
20232023
default_model = load_sql_based_model(default_expressions)
2024-
assert default_model.grants_target_layer == GrantsTargetLayer.ALL # default value
2024+
assert default_model.grants_target_layer == GrantsTargetLayer.VIRTUAL # default value
20252025

20262026

20272027
def test_render_definition_partitioned_by():

‎tests/core/test_snapshot.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ def test_json(snapshot: Snapshot):
168168
"enabled": True,
169169
"extract_dependencies_from_query": True,
170170
"virtual_environment_mode": "full",
171-
"grants_target_layer": "all",
171+
"grants_target_layer": "virtual",
172172
},
173173
"name": '"name"',
174174
"parents": [{"name": '"parent"."tbl"', "identifier": snapshot.parents[0].identifier}],
@@ -985,7 +985,7 @@ def test_fingerprint(model: Model, parent_model: Model):
985985

986986
original_fingerprint = SnapshotFingerprint(
987987
data_hash="2406542604",
988-
metadata_hash="185287368",
988+
metadata_hash="1056339358",
989989
)
990990

991991
assert fingerprint == original_fingerprint
@@ -1046,7 +1046,7 @@ def test_fingerprint_seed_model():
10461046

10471047
expected_fingerprint = SnapshotFingerprint(
10481048
data_hash="1586624913",
1049-
metadata_hash="1817881990",
1049+
metadata_hash="2674364560",
10501050
)
10511051

10521052
model = load_sql_based_model(expressions, path=Path("./examples/sushi/models/test_model.sql"))
@@ -1085,7 +1085,7 @@ def test_fingerprint_jinja_macros(model: Model):
10851085
)
10861086
original_fingerprint = SnapshotFingerprint(
10871087
data_hash="93332825",
1088-
metadata_hash="185287368",
1088+
metadata_hash="1056339358",
10891089
)
10901090

10911091
fingerprint = fingerprint_from_node(model, nodes={})

‎tests/core/test_snapshot_evaluator.py‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4996,7 +4996,9 @@ def test_grants_create_model_kind(
49964996
sync_grants_mock = mocker.patch.object(adapter_mock, "sync_grants_config")
49974997

49984998
grants = {"select": ["user1"]}
4999-
model = _create_grants_test_model(grants=grants, kind=model_kind_name)
4999+
model = _create_grants_test_model(
5000+
grants=grants, kind=model_kind_name, grants_target_layer=GrantsTargetLayer.ALL
5001+
)
50005002
snapshot = make_snapshot(model)
50015003

50025004
evaluator = SnapshotEvaluator(adapter_mock)
@@ -5065,6 +5067,7 @@ def test_grants_update(
50655067
parse_one("SELECT 1 as id"),
50665068
kind="FULL",
50675069
grants={"select": ["user1"]},
5070+
grants_target_layer=GrantsTargetLayer.ALL,
50685071
)
50695072

50705073
snapshot = make_snapshot(model)
@@ -5122,7 +5125,8 @@ def test_grants_create_and_evaluate(
51225125
grants (
51235126
'select' = ['reader1', 'reader2'],
51245127
'insert' = ['writer']
5125-
)
5128+
),
5129+
grants_target_layer 'all'
51265130
);
51275131
SELECT ds::DATE, value::INT FROM source WHERE ds BETWEEN @start_ds AND @end_ds;
51285132
"""
@@ -5171,7 +5175,7 @@ def test_grants_materializable_strategy_migrate(
51715175
sync_grants_mock = mocker.patch.object(adapter_mock, "sync_grants_config")
51725176
strategy = strategy_class(adapter_mock)
51735177
grants = {"select": ["user1"]}
5174-
model = _create_grants_test_model(grants=grants)
5178+
model = _create_grants_test_model(grants=grants, grants_target_layer=GrantsTargetLayer.ALL)
51755179
snapshot = make_snapshot(model)
51765180

51775181
strategy.migrate(
@@ -5196,7 +5200,7 @@ def test_grants_clone_snapshot_in_dev(
51965200

51975201
evaluator = SnapshotEvaluator(adapter_mock)
51985202
grants = {"select": ["user1", "user2"]}
5199-
model = _create_grants_test_model(grants=grants)
5203+
model = _create_grants_test_model(grants=grants, grants_target_layer=GrantsTargetLayer.ALL)
52005204
snapshot = make_snapshot(model)
52015205
snapshot.categorize_as(SnapshotChangeCategory.BREAKING)
52025206

@@ -5232,7 +5236,9 @@ def test_grants_evaluator_insert_without_replace_query_for_model(
52325236
evaluator = SnapshotEvaluator(adapter_mock)
52335237

52345238
grants = {"select": ["reader1", "reader2"]}
5235-
model = _create_grants_test_model(grants=grants, kind=model_kind_name)
5239+
model = _create_grants_test_model(
5240+
grants=grants, kind=model_kind_name, grants_target_layer=GrantsTargetLayer.ALL
5241+
)
52365242
snapshot = make_snapshot(model)
52375243
snapshot.categorize_as(SnapshotChangeCategory.BREAKING)
52385244

@@ -5289,7 +5295,9 @@ def test_grants_evaluator_insert_with_replace_query_for_model(
52895295
evaluator = SnapshotEvaluator(adapter_mock)
52905296

52915297
grants = {"select": ["user1"]}
5292-
model = _create_grants_test_model(grants=grants, kind=model_kind_name)
5298+
model = _create_grants_test_model(
5299+
grants=grants, kind=model_kind_name, grants_target_layer=GrantsTargetLayer.ALL
5300+
)
52935301
snapshot = make_snapshot(model)
52945302
snapshot.categorize_as(SnapshotChangeCategory.BREAKING)
52955303

0 commit comments

Comments
 (0)