Skip to content

parser: split select into select, tables, values #484

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
May 17, 2025
Merged

parser: split select into select, tables, values #484

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
13 changes: 7 additions & 6 deletions crates/squawk_parser/src/grammar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2353,7 +2353,7 @@ fn select_stmt(p: &mut Parser, m: Option<Marker>) -> Option<CompletedMarker> {
// table [only] name [*]
if p.eat(TABLE_KW) {
relation_name(p);
return Some(m.complete(p, SELECT));
return Some(m.complete(p, TABLE_STMT));
}
// with aka cte
// [ WITH [ RECURSIVE ] with_query [, ...] ]
Expand Down Expand Up @@ -8252,7 +8252,7 @@ fn create_materialized_view_stmt(p: &mut Parser<'_>) -> CompletedMarker {
},
);
match statement.map(|x| x.kind()) {
Some(SELECT) => (),
Some(SELECT | TABLE_STMT | VALUES) => (),
Some(kind) => {
p.error(format!(
"expected SELECT, TABLE, or VALUES statement, got {:?}",
Expand Down Expand Up @@ -8584,7 +8584,7 @@ fn select_insert_delete_update_or_notify(p: &mut Parser<'_>) {
);
if let Some(statement) = statement {
match statement.kind() {
SELECT | INSERT_STMT | UPDATE_STMT | DELETE_STMT | NOTIFY_STMT => (),
SELECT | VALUES | INSERT_STMT | UPDATE_STMT | DELETE_STMT | NOTIFY_STMT => (),
kind => {
p.error(format!(
"expected SELECT, INSERT, UPDATE, DELETE, NOTIFY, or VALUES statement, got {:?}",
Expand Down Expand Up @@ -9656,6 +9656,7 @@ fn explain_stmt(p: &mut Parser<'_>) -> CompletedMarker {
if let Some(statement) = statement {
match statement.kind() {
SELECT
| VALUES
| INSERT_STMT
| UPDATE_STMT
| DELETE_STMT
Expand Down Expand Up @@ -10626,7 +10627,7 @@ fn values_clause(p: &mut Parser<'_>, m: Option<Marker>) -> CompletedMarker {
opt_limit_clause(p);
opt_offset_clause(p);
opt_fetch_clause(p);
m.complete(p, SELECT)
m.complete(p, VALUES)
}

// REINDEX [ ( option [, ...] ) ] { INDEX | TABLE | SCHEMA } [ CONCURRENTLY ] name
Expand Down Expand Up @@ -10796,7 +10797,7 @@ fn prepare_stmt(p: &mut Parser<'_>) -> CompletedMarker {
);
if let Some(statement) = statement {
match statement.kind() {
SELECT | INSERT_STMT | UPDATE_STMT | DELETE_STMT | MERGE_STMT => (),
SELECT | VALUES | INSERT_STMT | UPDATE_STMT | DELETE_STMT | MERGE_STMT => (),
kind => {
p.error(format!(
"expected SELECT, INSERT, UPDATE, DELETE, MERGE, or VALUES statement, got {:?}",
Expand Down Expand Up @@ -12985,7 +12986,7 @@ fn alter_table_action(p: &mut Parser<'_>) -> Option<SyntaxKind> {
p.bump(CLUSTER_KW);
p.bump(ON_KW);
name_ref(p);
DISABLE_CLUSTER
CLUSTER_ON
}
// OWNER TO { new_owner | CURRENT_ROLE | CURRENT_USER | SESSION_USER }
OWNER_KW => {
Expand Down
2 changes: 1 addition & 1 deletion crates/squawk_parser/src/snapshots/squawk_parser__test__alter_materialized_view_ok.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,7 +691,7 @@ SOURCE_FILE
NAME_REF
IDENT "v"
WHITESPACE "\n "
DISABLE_CLUSTER
CLUSTER_ON
CLUSTER_KW "cluster"
WHITESPACE " "
ON_KW "on"
Expand Down
2 changes: 1 addition & 1 deletion crates/squawk_parser/src/snapshots/squawk_parser__test__alter_table_ok.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1656,7 +1656,7 @@ SOURCE_FILE
NAME_REF
IDENT "t"
WHITESPACE " "
DISABLE_CLUSTER
CLUSTER_ON
CLUSTER_KW "cluster"
WHITESPACE " "
ON_KW "on"
Expand Down
4 changes: 2 additions & 2 deletions crates/squawk_parser/src/snapshots/squawk_parser__test__create_materialized_view_ok.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ SOURCE_FILE
WHITESPACE "\n "
AS_KW "as"
WHITESPACE " "
SELECT
TABLE_STMT
TABLE_KW "table"
WHITESPACE " "
PATH
Expand All @@ -183,7 +183,7 @@ SOURCE_FILE
WHITESPACE "\n "
AS_KW "as"
WHITESPACE " "
SELECT
VALUES
VALUES_KW "values"
WHITESPACE " "
L_PAREN "("
Expand Down
4 changes: 2 additions & 2 deletions crates/squawk_parser/src/snapshots/squawk_parser__test__create_rule_ok.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ SOURCE_FILE
NAME_REF
IDENT "t"
WHITESPACE " "
SELECT
VALUES
VALUES_KW "values"
WHITESPACE " "
L_PAREN "("
Expand All @@ -152,7 +152,7 @@ SOURCE_FILE
IDENT "t"
SEMICOLON ";"
WHITESPACE "\n "
SELECT
VALUES
VALUES_KW "values"
WHITESPACE " "
L_PAREN "("
Expand Down
6 changes: 3 additions & 3 deletions crates/squawk_parser/src/snapshots/squawk_parser__test__create_table_as_ok.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ SOURCE_FILE
WHITESPACE " "
AS_KW "as"
WHITESPACE "\n "
SELECT
TABLE_STMT
TABLE_KW "table"
WHITESPACE " "
PATH
Expand All @@ -117,7 +117,7 @@ SOURCE_FILE
WHITESPACE " "
AS_KW "as"
WHITESPACE "\n "
SELECT
VALUES
VALUES_KW "values"
WHITESPACE " "
L_PAREN "("
Expand All @@ -140,7 +140,7 @@ SOURCE_FILE
WHITESPACE " "
AS_KW "as"
WHITESPACE "\n "
SELECT
VALUES
VALUES_KW "values"
WHITESPACE " "
L_PAREN "("
Expand Down
2 changes: 1 addition & 1 deletion crates/squawk_parser/src/snapshots/squawk_parser__test__create_view_ok.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ SOURCE_FILE
AS_KW "AS"
WHITESPACE "\n "
COMPOUND_SELECT
SELECT
VALUES
VALUES_KW "VALUES"
WHITESPACE " "
L_PAREN "("
Expand Down
2 changes: 1 addition & 1 deletion crates/squawk_parser/src/snapshots/squawk_parser__test__explain_ok.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,7 @@ SOURCE_FILE
L_PAREN "("
PAREN_EXPR
L_PAREN "("
SELECT
VALUES
VALUES_KW "values"
WHITESPACE " "
L_PAREN "("
Expand Down
6 changes: 3 additions & 3 deletions crates/squawk_parser/src/snapshots/squawk_parser__test__insert_err.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ SOURCE_FILE
IDENT "c"
R_PAREN ")"
WHITESPACE "\n "
SELECT
VALUES
VALUES_KW "values"
WHITESPACE " "
L_PAREN "("
Expand Down Expand Up @@ -83,7 +83,7 @@ SOURCE_FILE
COMMA ","
R_PAREN ")"
WHITESPACE "\n "
SELECT
VALUES
VALUES_KW "values"
WHITESPACE " "
L_PAREN "("
Expand Down Expand Up @@ -137,7 +137,7 @@ SOURCE_FILE
IDENT "c"
R_PAREN ")"
WHITESPACE "\n "
SELECT
VALUES
VALUES_KW "values"
WHITESPACE " "
L_PAREN "("
Expand Down
36 changes: 18 additions & 18 deletions crates/squawk_parser/src/snapshots/squawk_parser__test__insert_ok.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ SOURCE_FILE
NAME_REF
IDENT "products"
WHITESPACE " "
SELECT
VALUES
VALUES_KW "values"
WHITESPACE " "
L_PAREN "("
Expand Down Expand Up @@ -59,7 +59,7 @@ SOURCE_FILE
IDENT "price"
R_PAREN ")"
WHITESPACE " "
SELECT
VALUES
VALUES_KW "values"
WHITESPACE " "
L_PAREN "("
Expand Down Expand Up @@ -103,7 +103,7 @@ SOURCE_FILE
IDENT "product_no"
R_PAREN ")"
WHITESPACE " "
SELECT
VALUES
VALUES_KW "values"
WHITESPACE " "
L_PAREN "("
Expand Down Expand Up @@ -162,7 +162,7 @@ SOURCE_FILE
IDENT "price"
R_PAREN ")"
WHITESPACE " "
SELECT
VALUES
VALUES_KW "values"
WHITESPACE "\n "
L_PAREN "("
Expand Down Expand Up @@ -357,7 +357,7 @@ SOURCE_FILE
NAME_REF
IDENT "films"
WHITESPACE " "
SELECT
VALUES
VALUES_KW "VALUES"
WHITESPACE "\n "
L_PAREN "("
Expand Down Expand Up @@ -423,7 +423,7 @@ SOURCE_FILE
IDENT "kind"
R_PAREN ")"
WHITESPACE "\n "
SELECT
VALUES
VALUES_KW "VALUES"
WHITESPACE " "
L_PAREN "("
Expand Down Expand Up @@ -458,7 +458,7 @@ SOURCE_FILE
NAME_REF
IDENT "films"
WHITESPACE " "
SELECT
VALUES
VALUES_KW "VALUES"
WHITESPACE "\n "
L_PAREN "("
Expand Down Expand Up @@ -524,7 +524,7 @@ SOURCE_FILE
IDENT "kind"
R_PAREN ")"
WHITESPACE "\n "
SELECT
VALUES
VALUES_KW "VALUES"
WHITESPACE " "
L_PAREN "("
Expand Down Expand Up @@ -601,7 +601,7 @@ SOURCE_FILE
IDENT "kind"
R_PAREN ")"
WHITESPACE " "
SELECT
VALUES
VALUES_KW "VALUES"
WHITESPACE "\n "
L_PAREN "("
Expand Down Expand Up @@ -725,7 +725,7 @@ SOURCE_FILE
R_BRACK "]"
R_PAREN ")"
WHITESPACE "\n "
SELECT
VALUES
VALUES_KW "VALUES"
WHITESPACE " "
L_PAREN "("
Expand Down Expand Up @@ -762,7 +762,7 @@ SOURCE_FILE
IDENT "board"
R_PAREN ")"
WHITESPACE "\n "
SELECT
VALUES
VALUES_KW "VALUES"
WHITESPACE " "
L_PAREN "("
Expand Down Expand Up @@ -797,7 +797,7 @@ SOURCE_FILE
IDENT "dname"
R_PAREN ")"
WHITESPACE " "
SELECT
VALUES
VALUES_KW "VALUES"
WHITESPACE " "
L_PAREN "("
Expand Down Expand Up @@ -947,7 +947,7 @@ SOURCE_FILE
IDENT "dname"
R_PAREN ")"
WHITESPACE "\n "
SELECT
VALUES
VALUES_KW "VALUES"
WHITESPACE " "
L_PAREN "("
Expand Down Expand Up @@ -1019,7 +1019,7 @@ SOURCE_FILE
IDENT "dname"
R_PAREN ")"
WHITESPACE " "
SELECT
VALUES
VALUES_KW "VALUES"
WHITESPACE " "
L_PAREN "("
Expand Down Expand Up @@ -1075,7 +1075,7 @@ SOURCE_FILE
IDENT "dname"
R_PAREN ")"
WHITESPACE " "
SELECT
VALUES
VALUES_KW "VALUES"
WHITESPACE " "
L_PAREN "("
Expand Down Expand Up @@ -1185,7 +1185,7 @@ SOURCE_FILE
IDENT "dname"
R_PAREN ")"
WHITESPACE " "
SELECT
VALUES
VALUES_KW "VALUES"
WHITESPACE " "
L_PAREN "("
Expand Down Expand Up @@ -1241,7 +1241,7 @@ SOURCE_FILE
IDENT "dname"
R_PAREN ")"
WHITESPACE " "
SELECT
VALUES
VALUES_KW "VALUES"
WHITESPACE " "
L_PAREN "("
Expand Down Expand Up @@ -1297,7 +1297,7 @@ SOURCE_FILE
IDENT "c"
R_PAREN ")"
WHITESPACE " "
SELECT
VALUES
VALUES_KW "values"
WHITESPACE " "
L_PAREN "("
Expand Down
10 changes: 5 additions & 5 deletions crates/squawk_parser/src/snapshots/squawk_parser__test__merge_pg17_ok.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,7 +544,7 @@ SOURCE_FILE
WHITESPACE " "
VALUE_KW "value"
WHITESPACE "\n "
SELECT
VALUES
VALUES_KW "values"
WHITESPACE " "
L_PAREN "("
Expand Down Expand Up @@ -980,7 +980,7 @@ SOURCE_FILE
IDENT "balance"
R_PAREN ")"
WHITESPACE "\n "
SELECT
VALUES
VALUES_KW "VALUES"
WHITESPACE " "
L_PAREN "("
Expand Down Expand Up @@ -1114,7 +1114,7 @@ SOURCE_FILE
IDENT "balance"
R_PAREN ")"
WHITESPACE "\n "
SELECT
VALUES
VALUES_KW "VALUES"
WHITESPACE " "
L_PAREN "("
Expand Down Expand Up @@ -1205,7 +1205,7 @@ SOURCE_FILE
WHITESPACE "\n "
INSERT_KW "INSERT"
WHITESPACE " "
SELECT
VALUES
VALUES_KW "VALUES"
L_PAREN "("
FIELD_EXPR
Expand Down Expand Up @@ -1365,7 +1365,7 @@ SOURCE_FILE
WHITESPACE "\n "
INSERT_KW "INSERT"
WHITESPACE " "
SELECT
VALUES
VALUES_KW "VALUES"
L_PAREN "("
FIELD_EXPR
Expand Down
Loading
Loading