Skip to content

parser: add AsName node for column aliases / column labels #689

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
Oct 13, 2025
Merged

parser: add AsName node for column aliases / column labels #689

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
1 change: 1 addition & 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.

20 changes: 10 additions & 10 deletions crates/squawk_parser/src/grammar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4714,23 +4714,23 @@ fn opt_target_el(p: &mut Parser) -> Option<CompletedMarker> {
Some(m.complete(p, TARGET))
}

fn opt_as_col_label(p: &mut Parser<'_>) -> bool {
fn opt_as_col_label(p: &mut Parser<'_>) {
let m = p.start();
if p.eat(AS_KW) {
if p.at_ts(COL_LABEL_FIRST) {
col_label(p);
true
m.complete(p, AS_NAME);
} else {
p.err_and_bump(&format!("expected column label, got {:?}", p.current()));
false
m.abandon(p);
}
} else if p.at(FORMAT_KW) && p.nth_at(1, JSON_KW) {
m.abandon(p);
} else if p.at_ts(BARE_COL_LABEL_FIRST) {
col_label(p);
m.complete(p, AS_NAME);
} else {
if p.at(FORMAT_KW) && p.nth_at(1, JSON_KW) {
return true;
}
if p.at_ts(BARE_COL_LABEL_FIRST) {
col_label(p);
}
true
m.abandon(p);
}
}

Expand Down
9 changes: 5 additions & 4 deletions crates/squawk_parser/tests/snapshots/tests__create_materialized_view_ok.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,10 +253,11 @@ SOURCE_FILE
LITERAL
STRING "'country'"
WHITESPACE " "
AS_KW "as"
WHITESPACE " "
NAME
IDENT "\"country\""
AS_NAME
AS_KW "as"
WHITESPACE " "
NAME
IDENT "\"country\""
WHITESPACE " \n "
FROM_CLAUSE
FROM_KW "from"
Expand Down
27 changes: 15 additions & 12 deletions crates/squawk_parser/tests/snapshots/tests__create_view_ok.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,11 @@ SOURCE_FILE
LITERAL
STRING "'Hello World'"
WHITESPACE " "
AS_KW "AS"
WHITESPACE " "
NAME
IDENT "hello"
AS_NAME
AS_KW "AS"
WHITESPACE " "
NAME
IDENT "hello"
SEMICOLON ";"
WHITESPACE "\n\n"
CREATE_VIEW
Expand Down Expand Up @@ -233,10 +234,11 @@ SOURCE_FILE
IDENT "country_code"
R_PAREN ")"
WHITESPACE " "
AS_KW "AS"
WHITESPACE " "
NAME
IDENT "country"
AS_NAME
AS_KW "AS"
WHITESPACE " "
NAME
IDENT "country"
COMMA ","
WHITESPACE "\n "
TARGET
Expand Down Expand Up @@ -293,10 +295,11 @@ SOURCE_FILE
IDENT "id"
R_PAREN ")"
WHITESPACE " "
AS_KW "AS"
WHITESPACE " "
NAME
IDENT "avg_rating"
AS_NAME
AS_KW "AS"
WHITESPACE " "
NAME
IDENT "avg_rating"
WHITESPACE "\n "
FROM_CLAUSE
FROM_KW "FROM"
Expand Down
9 changes: 5 additions & 4 deletions crates/squawk_parser/tests/snapshots/tests__delete_ok.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,10 +308,11 @@ SOURCE_FILE
IDENT "login_time"
R_PAREN ")"
WHITESPACE " "
AS_KW "as"
WHITESPACE " "
NAME
IDENT "last_login"
AS_NAME
AS_KW "as"
WHITESPACE " "
NAME
IDENT "last_login"
WHITESPACE "\n "
FROM_CLAUSE
FROM_KW "from"
Expand Down
14 changes: 8 additions & 6 deletions crates/squawk_parser/tests/snapshots/tests__merge_pg17_ok.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,18 +377,20 @@ SOURCE_FILE
NAME_REF
IDENT "u"
WHITESPACE " "
AS_KW "as"
WHITESPACE " "
NAME
IDENT "bar"
AS_NAME
AS_KW "as"
WHITESPACE " "
NAME
IDENT "bar"
COMMA ","
WHITESPACE " "
TARGET
NAME_REF
IDENT "t"
WHITESPACE " "
NAME
IDENT "b"
AS_NAME
NAME
IDENT "b"
COMMA ","
WHITESPACE " "
TARGET
Expand Down
Loading
Loading