Skip to content

parser: add more nodes for create policy/alter policy ast #884

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

Merged
kodiakhq merged 1 commit into from
Jan 24, 2026
Merged

parser: add more nodes for create policy/alter policy ast #884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions crates/squawk_fmt/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ documentation.workspace = true
homepage.workspace = true
repository.workspace = true

[lib]
doctest = false

[dependencies]
tiny_pretty.workspace = true
itertools.workspace = true
Expand Down
3 changes: 3 additions & 0 deletions crates/squawk_parser/src/generated/syntax_kind.rs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

61 changes: 35 additions & 26 deletions crates/squawk_parser/src/grammar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6234,25 +6234,25 @@ fn alter_policy(p: &mut Parser<'_>) -> CompletedMarker {
if p.eat(TO_KW) {
role_list(p);
}
if p.eat(USING_KW) {
p.expect(L_PAREN);
if expr(p).is_none() {
p.error("expected expression");
}
p.expect(R_PAREN);
}
if p.eat(WITH_KW) {
p.expect(CHECK_KW);
p.expect(L_PAREN);
if expr(p).is_none() {
p.error("expected expression");
}
p.expect(R_PAREN);
}
opt_using_expr_clause(p);
opt_with_check_expr_clause(p);
}
m.complete(p, ALTER_POLICY)
}

fn opt_using_expr_clause(p: &mut Parser<'_>) {
if p.at(USING_KW) {
let m = p.start();
p.bump(USING_KW);
p.expect(L_PAREN);
if expr(p).is_none() {
p.error("expected expression");
}
p.expect(R_PAREN);
m.complete(p, USING_EXPR_CLAUSE);
}
}

fn role_list(p: &mut Parser<'_>) {
let m = p.start();
role_ref(p);
Expand Down Expand Up @@ -9042,9 +9042,7 @@ fn create_policy(p: &mut Parser<'_>) -> CompletedMarker {
p.bump(POLICY_KW);
name(p);
on_table(p);
if p.eat(AS_KW) {
ident(p);
}
opt_as_policy_type(p);
if p.eat(FOR_KW) {
let _ = p.eat(ALL_KW)
|| p.eat(SELECT_KW)
Expand All @@ -9055,22 +9053,33 @@ fn create_policy(p: &mut Parser<'_>) -> CompletedMarker {
if p.eat(TO_KW) {
role_list(p);
}
if p.eat(USING_KW) {
p.expect(L_PAREN);
if expr(p).is_none() {
p.error("expected expression");
}
p.expect(R_PAREN);
opt_using_expr_clause(p);
opt_with_check_expr_clause(p);
m.complete(p, CREATE_POLICY)
}

fn opt_as_policy_type(p: &mut Parser<'_>) {
let m = p.start();
if p.eat(AS_KW) {
ident(p);
m.complete(p, AS_POLICY_TYPE);
} else {
m.abandon(p);
}
if p.eat(WITH_KW) {
}

fn opt_with_check_expr_clause(p: &mut Parser<'_>) {
if p.at(WITH_KW) {
let m = p.start();
p.bump(WITH_KW);
p.expect(CHECK_KW);
p.expect(L_PAREN);
if expr(p).is_none() {
p.error("expected expression");
}
p.expect(R_PAREN);
m.complete(p, WITH_CHECK_EXPR_CLAUSE);
}
m.complete(p, CREATE_POLICY)
}

// CREATE [ OR REPLACE ] PROCEDURE
Expand Down
96 changes: 50 additions & 46 deletions crates/squawk_parser/tests/snapshots/tests__alter_policy_ok.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,18 +109,19 @@ SOURCE_FILE
NAME_REF
IDENT "t"
WHITESPACE "\n "
USING_KW "using"
WHITESPACE " "
L_PAREN "("
BIN_EXPR
NAME_REF
IDENT "a"
WHITESPACE " "
EQ "="
USING_EXPR_CLAUSE
USING_KW "using"
WHITESPACE " "
NAME_REF
IDENT "b"
R_PAREN ")"
L_PAREN "("
BIN_EXPR
NAME_REF
IDENT "a"
WHITESPACE " "
EQ "="
WHITESPACE " "
NAME_REF
IDENT "b"
R_PAREN ")"
SEMICOLON ";"
WHITESPACE "\n\n"
COMMENT "-- with_check"
Expand All @@ -141,20 +142,21 @@ SOURCE_FILE
NAME_REF
IDENT "t"
WHITESPACE "\n "
WITH_KW "with"
WHITESPACE " "
CHECK_KW "check"
WHITESPACE " "
L_PAREN "("
BIN_EXPR
NAME_REF
IDENT "c"
WITH_CHECK_EXPR_CLAUSE
WITH_KW "with"
WHITESPACE " "
R_ANGLE ">"
CHECK_KW "check"
WHITESPACE " "
NAME_REF
IDENT "d"
R_PAREN ")"
L_PAREN "("
BIN_EXPR
NAME_REF
IDENT "c"
WHITESPACE " "
R_ANGLE ">"
WHITESPACE " "
NAME_REF
IDENT "d"
R_PAREN ")"
SEMICOLON ";"
WHITESPACE "\n\n"
COMMENT "-- full"
Expand Down Expand Up @@ -187,32 +189,34 @@ SOURCE_FILE
NAME_REF
IDENT "s"
WHITESPACE "\n "
USING_KW "using"
WHITESPACE " "
L_PAREN "("
BIN_EXPR
NAME_REF
IDENT "a"
WHITESPACE " "
EQ "="
USING_EXPR_CLAUSE
USING_KW "using"
WHITESPACE " "
NAME_REF
IDENT "b"
R_PAREN ")"
L_PAREN "("
BIN_EXPR
NAME_REF
IDENT "a"
WHITESPACE " "
EQ "="
WHITESPACE " "
NAME_REF
IDENT "b"
R_PAREN ")"
WHITESPACE "\n "
WITH_KW "with"
WHITESPACE " "
CHECK_KW "check"
WHITESPACE " "
L_PAREN "("
BIN_EXPR
NAME_REF
IDENT "c"
WITH_CHECK_EXPR_CLAUSE
WITH_KW "with"
WHITESPACE " "
R_ANGLE ">"
CHECK_KW "check"
WHITESPACE " "
NAME_REF
IDENT "d"
R_PAREN ")"
L_PAREN "("
BIN_EXPR
NAME_REF
IDENT "c"
WHITESPACE " "
R_ANGLE ">"
WHITESPACE " "
NAME_REF
IDENT "d"
R_PAREN ")"
SEMICOLON ";"
WHITESPACE "\n\n"
83 changes: 44 additions & 39 deletions crates/squawk_parser/tests/snapshots/tests__create_policy_ok.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,10 @@ SOURCE_FILE
NAME_REF
IDENT "t"
WHITESPACE "\n "
AS_KW "as"
WHITESPACE " "
IDENT "permissive"
AS_POLICY_TYPE
AS_KW "as"
WHITESPACE " "
IDENT "permissive"
SEMICOLON ";"
WHITESPACE "\n\n"
CREATE_POLICY
Expand All @@ -61,9 +62,10 @@ SOURCE_FILE
NAME_REF
IDENT "t"
WHITESPACE "\n "
AS_KW "as"
WHITESPACE " "
IDENT "restrictive"
AS_POLICY_TYPE
AS_KW "as"
WHITESPACE " "
IDENT "restrictive"
SEMICOLON ";"
WHITESPACE "\n\n"
COMMENT "-- full"
Expand All @@ -89,9 +91,10 @@ SOURCE_FILE
NAME_REF
IDENT "t"
WHITESPACE "\n "
AS_KW "as"
WHITESPACE " "
IDENT "permissive"
AS_POLICY_TYPE
AS_KW "as"
WHITESPACE " "
IDENT "permissive"
WHITESPACE "\n "
FOR_KW "for"
WHITESPACE " "
Expand All @@ -116,46 +119,48 @@ SOURCE_FILE
ROLE_REF
SESSION_USER_KW "session_user"
WHITESPACE "\n "
USING_KW "using"
WHITESPACE " "
L_PAREN "("
BIN_EXPR
USING_EXPR_CLAUSE
USING_KW "using"
WHITESPACE " "
L_PAREN "("
BIN_EXPR
NAME_REF
IDENT "x"
BIN_EXPR
NAME_REF
IDENT "x"
WHITESPACE " "
R_ANGLE ">"
WHITESPACE " "
NAME_REF
IDENT "b"
WHITESPACE " "
R_ANGLE ">"
AND_KW "and"
WHITESPACE " "
NAME_REF
IDENT "b"
BIN_EXPR
LITERAL
INT_NUMBER "1"
WHITESPACE " "
L_ANGLE "<"
WHITESPACE " "
LITERAL
INT_NUMBER "2"
R_PAREN ")"
WHITESPACE "\n "
WITH_CHECK_EXPR_CLAUSE
WITH_KW "with"
WHITESPACE " "
CHECK_KW "check"
WHITESPACE " "
AND_KW "and"
L_PAREN "("
WHITESPACE " "
BIN_EXPR
LITERAL
INT_NUMBER "1"
NAME_REF
IDENT "x"
WHITESPACE " "
L_ANGLE "<"
WHITESPACE " "
LITERAL
INT_NUMBER "2"
R_PAREN ")"
WHITESPACE "\n "
WITH_KW "with"
WHITESPACE " "
CHECK_KW "check"
WHITESPACE " "
L_PAREN "("
WHITESPACE " "
BIN_EXPR
NAME_REF
IDENT "x"
WHITESPACE " "
L_ANGLE "<"
WHITESPACE " "
LITERAL
INT_NUMBER "1"
R_PAREN ")"
INT_NUMBER "1"
R_PAREN ")"
SEMICOLON ";"
WHITESPACE "\n\n"
COMMENT "-- for_"
Expand Down
Loading
Loading