Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions crates/squawk_parser/src/generated/syntax_kind.rs

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

21 changes: 14 additions & 7 deletions crates/squawk_parser/src/grammar.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6435,10 +6435,7 @@ fn alter_materialized_view(p: &mut Parser<'_>) -> CompletedMarker {
p.expect(IN_KW);
p.expect(TABLESPACE_KW);
name_ref(p);
if p.eat(OWNED_KW) {
p.expect(BY_KW);
role_list(p);
}
opt_owned_by_roles(p);
p.expect(SET_KW);
p.expect(TABLESPACE_KW);
name(p);
Expand Down Expand Up @@ -13717,14 +13714,24 @@ fn alter_table(p: &mut Parser<'_>) -> CompletedMarker {
relation_name(p);
// ALTER TABLE ALL IN TABLESPACE name [ OWNED BY role_name [, ... ] ]
// SET TABLESPACE new_tablespace [ NOWAIT ]
if all_in_tablespace && p.eat(OWNED_KW) {
p.expect(BY_KW);
name_ref_list(p);
if all_in_tablespace {
opt_owned_by_roles(p);
}
opt_alter_table_action_list(p);
m.complete(p, ALTER_TABLE)
}

fn opt_owned_by_roles(p: &mut Parser<'_>) {
if !p.at(OWNED_KW) {
return;
}
let m = p.start();
p.bump(OWNED_KW);
p.expect(BY_KW);
role_list(p);
m.complete(p, OWNED_BY_ROLES);
}

const ALTER_TABLE_ACTION_FIRST: TokenSet = TokenSet::new(&[
VALIDATE_KW,
REPLICA_KW,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -260,18 +260,19 @@ SOURCE_FILE
NAME_REF
IDENT "t"
WHITESPACE "\n "
OWNED_KW "owned"
WHITESPACE " "
BY_KW "by"
WHITESPACE " "
ROLE_LIST
ROLE
CURRENT_USER_KW "current_user"
COMMA ","
OWNED_BY_ROLES
OWNED_KW "owned"
WHITESPACE " "
ROLE
NAME_REF
IDENT "u"
BY_KW "by"
WHITESPACE " "
ROLE_LIST
ROLE
CURRENT_USER_KW "current_user"
COMMA ","
WHITESPACE " "
ROLE
NAME_REF
IDENT "u"
WHITESPACE "\n "
SET_KW "set"
WHITESPACE " "
Expand Down
48 changes: 28 additions & 20 deletions crates/squawk_parser/tests/snapshots/tests__alter_table_ok.snap
Original file line number Diff line number Diff line change
Expand Up @@ -3517,20 +3517,25 @@ SOURCE_FILE
NAME_REF
IDENT "foo"
WHITESPACE " "
OWNED_KW "owned"
WHITESPACE " "
BY_KW "by"
WHITESPACE " "
NAME_REF
IDENT "a"
COMMA ","
WHITESPACE " "
NAME_REF
IDENT "b"
COMMA ","
WHITESPACE " "
NAME_REF
IDENT "c"
OWNED_BY_ROLES
OWNED_KW "owned"
WHITESPACE " "
BY_KW "by"
WHITESPACE " "
ROLE_LIST
ROLE
NAME_REF
IDENT "a"
COMMA ","
WHITESPACE " "
ROLE
NAME_REF
IDENT "b"
COMMA ","
WHITESPACE " "
ROLE
NAME_REF
IDENT "c"
WHITESPACE " \n"
SET_TABLESPACE
SET_KW "set"
Expand Down Expand Up @@ -3562,12 +3567,15 @@ SOURCE_FILE
NAME_REF
IDENT "foo"
WHITESPACE " "
OWNED_KW "owned"
WHITESPACE " "
BY_KW "by"
WHITESPACE " "
NAME_REF
IDENT "bar"
OWNED_BY_ROLES
OWNED_KW "owned"
WHITESPACE " "
BY_KW "by"
WHITESPACE " "
ROLE_LIST
ROLE
NAME_REF
IDENT "bar"
WHITESPACE "\n"
SET_TABLESPACE
SET_KW "set"
Expand Down
Loading
Loading