Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Snowflake: Fix ScalingPolicy and WarehouseType Refs in WarehouseObjectProperties and use ObjectReferenceSegment in AlterWarehouseStatementSegment #5264

Merged
merged 2 commits into from
Oct 2, 2023
Merged

Snowflake: Fix ScalingPolicy and WarehouseType Refs in WarehouseObjectProperties and use ObjectReferenceSegment in AlterWarehouseStatementSegment #5264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f63c82
Fix ScalingPolicy, WarehouseType Refs and use it in WarehouseObjectPr…
Oct 2, 2023
b931279
Replace NakedIdentifierSegment by ObjectReferenceSegment in AlterWar…
Oct 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 58 additions & 11 deletions src/sqlfluff/dialects/dialect_snowflake.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,14 @@
["CSV", "JSON", "AVRO", "ORC" "PARQUET", "XML"],
)

snowflake_dialect.sets("warehouse_types").clear()
snowflake_dialect.sets("warehouse_types").update(
[
"STANDARD",
"SNOWPARK-OPTIMIZED",
],
)

snowflake_dialect.sets("warehouse_sizes").clear()
snowflake_dialect.sets("warehouse_sizes").update(
[
Expand All @@ -177,6 +185,15 @@
],
)

snowflake_dialect.sets("warehouse_scaling_policies").clear()
snowflake_dialect.sets("warehouse_scaling_policies").update(
[
"STANDARD",
"ECONOMY",
],
)


snowflake_dialect.add(
# In snowflake, these are case sensitive even though they're not quoted
# so they need a different `name` and `type` so they're not picked up
Expand Down Expand Up @@ -221,6 +238,22 @@
),
# We use a RegexParser instead of keywords as some (those with dashes) require
# quotes:
WarehouseType=OneOf(
MultiStringParser(
[
type
for type in snowflake_dialect.sets("warehouse_types")
if "-" not in type
],
CodeSegment,
type="warehouse_size",
),
MultiStringParser(
[f"'{type}'" for type in snowflake_dialect.sets("warehouse_types")],
CodeSegment,
type="warehouse_size",
),
),
WarehouseSize=OneOf(
MultiStringParser(
[
Expand Down Expand Up @@ -252,6 +285,23 @@
type="compression_type",
),
),
ScalingPolicy=OneOf(
MultiStringParser(
snowflake_dialect.sets("warehouse_scaling_policies"),
KeywordSegment,
type="scaling_policy",
),
MultiStringParser(
[
f"'{scaling_policy}'"
for scaling_policy in snowflake_dialect.sets(
"warehouse_scaling_policies"
)
],
KeywordSegment,
type="scaling_policy",
),
),
ValidationModeOptionSegment=RegexParser(
r"'?RETURN_(?:\d+_ROWS|ERRORS|ALL_ERRORS)'?",
CodeSegment,
Expand Down Expand Up @@ -1949,7 +1999,7 @@ class AlterWarehouseStatementSegment(BaseSegment):
Sequence("IF", "EXISTS", optional=True),
OneOf(
Sequence(
Ref("NakedIdentifierSegment", optional=True),
Ref("ObjectReferenceSegment", optional=True),
OneOf(
"SUSPEND",
Sequence(
Expand All @@ -1959,21 +2009,21 @@ class AlterWarehouseStatementSegment(BaseSegment):
),
),
Sequence(
Ref("NakedIdentifierSegment", optional=True),
Ref("ObjectReferenceSegment", optional=True),
Sequence(
"ABORT",
"ALL",
"QUERIES",
),
),
Sequence(
Ref("NakedIdentifierSegment"),
Ref("ObjectReferenceSegment"),
"RENAME",
"TO",
Ref("NakedIdentifierSegment"),
Ref("ObjectReferenceSegment"),
),
Sequence(
Ref("NakedIdentifierSegment", optional=True),
Ref("ObjectReferenceSegment", optional=True),
"SET",
OneOf(
AnyNumberOf(
Expand All @@ -1985,7 +2035,7 @@ class AlterWarehouseStatementSegment(BaseSegment):
),
),
Sequence(
Ref("NakedIdentifierSegment"),
Ref("ObjectReferenceSegment"),
"UNSET",
OneOf(
Delimited(Ref("NakedIdentifierSegment")),
Expand Down Expand Up @@ -2995,7 +3045,7 @@ class WarehouseObjectPropertiesSegment(BaseSegment):
Sequence(
"WAREHOUSE_TYPE",
Ref("EqualsSegment"),
"STANDARD",
Ref("WarehouseType"),
),
Sequence(
"WAREHOUSE_SIZE",
Expand All @@ -3020,10 +3070,7 @@ class WarehouseObjectPropertiesSegment(BaseSegment):
Sequence(
"SCALING_POLICY",
Ref("EqualsSegment"),
OneOf(
"STANDARD",
"ECONOMY",
),
Ref("ScalingPolicy"),
),
Sequence(
"AUTO_SUSPEND",
Expand Down
14 changes: 13 additions & 1 deletion test/fixtures/dialects/snowflake/alter_warehouse.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@ alter warehouse LOAD_WH set warehouse_size = XXLARGE;
alter warehouse LOAD_WH set WAIT_FOR_COMPLETION = TRUE;
alter warehouse LOAD_WH set MAX_CLUSTER_COUNT = 5;
alter warehouse LOAD_WH set MIN_CLUSTER_COUNT = 1;

alter warehouse LOAD_WH set SCALING_POLICY = STANDARD;
alter warehouse LOAD_WH set SCALING_POLICY = 'STANDARD';
alter warehouse LOAD_WH set SCALING_POLICY = ECONOMY;
alter warehouse LOAD_WH set SCALING_POLICY = 'ECONOMY';


alter warehouse LOAD_WH set AUTO_SUSPEND = 1;
alter warehouse LOAD_WH set AUTO_RESUME = FALSE;
alter warehouse LOAD_WH set RESOURCE_MONITOR = monitor_name;
Expand All @@ -23,4 +29,10 @@ alter warehouse LOAD_WH UNSET WAREHOUSE_SIZE;
alter warehouse LOAD_WH UNSET WAREHOUSE_SIZE, WAIT_FOR_COMPLETION;

ALTER WAREHOUSE SET WAREHOUSE_SIZE='X-LARGE';
alter warehouse set warehouse_size=medium
alter warehouse set warehouse_size=medium;

alter warehouse LOAD_WH set WAREHOUSE_TYPE = STANDARD;
alter warehouse LOAD_WH set WAREHOUSE_TYPE = 'SNOWPARK-OPTIMIZED';

ALTER WAREHOUSE IDENTIFIER($var_wh) SET WAREHOUSE_TYPE = STANDARD;

Loading