Skip to content

parser: fix parsing nested compound select with parens #464

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 2 commits into from
May 12, 2025
Merged

parser: fix parsing nested compound select with parens #464

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
08afad2
add test case for panic
chdsbd May 12, 2025
fc80f22
fix parsing nested compound select with parens
sbdchd May 12, 2025
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
10 changes: 9 additions & 1 deletion crates/squawk_parser/src/grammar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2332,7 +2332,15 @@ fn compound_select(p: &mut Parser<'_>, cm: CompletedMarker) -> CompletedMarker {
if !p.eat(ALL_KW) {
p.eat(DISTINCT_KW);
}
select_stmt(p, None);
if p.at(L_PAREN) {
tuple_expr(p);
} else {
if p.at_ts(SELECT_FIRST) {
select_stmt(p, None);
} else {
p.error("expected start of a select statement")
}
}
m.complete(p, COMPOUND_SELECT)
}

Expand Down
256 changes: 256 additions & 0 deletions crates/squawk_parser/src/snapshots/squawk_parser__test__select_compound_union_select_ok.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,256 @@
---
source: crates/squawk_parser/src/test.rs
input_file: crates/squawk_parser/test_data/ok/select_compound_union_select.sql
---
SOURCE_FILE
SELECT
SELECT_CLAUSE
SELECT_KW "SELECT"
WHITESPACE " "
TARGET_LIST
TARGET
PAREN_EXPR
L_PAREN "("
WHITESPACE "\n "
COMPOUND_SELECT
PAREN_EXPR
L_PAREN "("
SELECT
SELECT_CLAUSE
SELECT_KW "SELECT"
WHITESPACE " "
TARGET_LIST
TARGET
NAME_REF
IDENT "id"
WHITESPACE " "
FROM_CLAUSE
FROM_KW "FROM"
WHITESPACE " "
NAME_REF
IDENT "code_categories"
WHITESPACE " "
WHERE_CLAUSE
WHERE_KW "WHERE"
WHITESPACE " "
BIN_EXPR
NAME_REF
IDENT "\"language\""
WHITESPACE " "
EQ "="
WHITESPACE " "
PREFIX_EXPR
CUSTOM_OP
AT "@"
CAST_EXPR
NAME_REF
LANGUAGE_KW "language"
COLON2 "::"
CHAR_TYPE
CHAR_KW "char"
L_PAREN "("
ARG_LIST
ARG
LITERAL
INT_NUMBER "4"
R_PAREN ")"
WHITESPACE " "
ORDER_BY_CLAUSE
ORDER_KW "ORDER"
WHITESPACE " "
BY_KW "BY"
WHITESPACE " "
NAME_REF
IDENT "\"id\""
WHITESPACE " "
ASC_KW "ASC"
WHITESPACE " "
LIMIT_CLAUSE
LIMIT_KW "LIMIT"
WHITESPACE " "
LITERAL
INT_NUMBER "1"
R_PAREN ")"
WHITESPACE "\n "
UNION_KW "UNION"
WHITESPACE "\n "
PAREN_EXPR
L_PAREN "("
SELECT
SELECT_CLAUSE
SELECT_KW "SELECT"
WHITESPACE " "
TARGET_LIST
TARGET
NAME_REF
IDENT "id"
WHITESPACE " "
FROM_CLAUSE
FROM_KW "FROM"
WHITESPACE " "
NAME_REF
IDENT "code_categories"
WHITESPACE " "
WHERE_CLAUSE
WHERE_KW "WHERE"
WHITESPACE " "
BIN_EXPR
NAME_REF
IDENT "\"language\""
WHITESPACE " "
EQ "="
WHITESPACE " "
LITERAL
STRING "'nl-NL'"
WHITESPACE " "
ORDER_BY_CLAUSE
ORDER_KW "ORDER"
WHITESPACE " "
BY_KW "BY"
WHITESPACE " "
NAME_REF
IDENT "\"id\""
WHITESPACE " "
ASC_KW "ASC"
WHITESPACE " "
LIMIT_CLAUSE
LIMIT_KW "LIMIT"
WHITESPACE " "
LITERAL
INT_NUMBER "1"
R_PAREN ")"
WHITESPACE "\n"
R_PAREN ")"
WHITESPACE " "
LIMIT_CLAUSE
LIMIT_KW "LIMIT"
WHITESPACE " "
LITERAL
INT_NUMBER "1"
SEMICOLON ";"
WHITESPACE "\n\n"
COMMENT "-- version without parentheses."
WHITESPACE "\n"
SELECT
SELECT_CLAUSE
SELECT_KW "SELECT"
WHITESPACE " "
TARGET_LIST
TARGET
PAREN_EXPR
L_PAREN "("
WHITESPACE "\n "
COMPOUND_SELECT
PAREN_EXPR
L_PAREN "("
SELECT
SELECT_CLAUSE
SELECT_KW "SELECT"
WHITESPACE " "
TARGET_LIST
TARGET
NAME_REF
IDENT "id"
WHITESPACE " "
FROM_CLAUSE
FROM_KW "FROM"
WHITESPACE " "
NAME_REF
IDENT "code_categories"
WHITESPACE " "
WHERE_CLAUSE
WHERE_KW "WHERE"
WHITESPACE " "
BIN_EXPR
NAME_REF
IDENT "\"language\""
WHITESPACE " "
EQ "="
WHITESPACE " "
PREFIX_EXPR
CUSTOM_OP
AT "@"
CAST_EXPR
NAME_REF
LANGUAGE_KW "language"
COLON2 "::"
CHAR_TYPE
CHAR_KW "char"
L_PAREN "("
ARG_LIST
ARG
LITERAL
INT_NUMBER "4"
R_PAREN ")"
WHITESPACE " "
ORDER_BY_CLAUSE
ORDER_KW "ORDER"
WHITESPACE " "
BY_KW "BY"
WHITESPACE " "
NAME_REF
IDENT "\"id\""
WHITESPACE " "
ASC_KW "ASC"
WHITESPACE " "
LIMIT_CLAUSE
LIMIT_KW "LIMIT"
WHITESPACE " "
LITERAL
INT_NUMBER "1"
R_PAREN ")"
WHITESPACE "\n "
UNION_KW "UNION"
WHITESPACE "\n "
SELECT
SELECT_CLAUSE
SELECT_KW "SELECT"
WHITESPACE " "
TARGET_LIST
TARGET
NAME_REF
IDENT "id"
WHITESPACE " "
FROM_CLAUSE
FROM_KW "FROM"
WHITESPACE " "
NAME_REF
IDENT "code_categories"
WHITESPACE " "
WHERE_CLAUSE
WHERE_KW "WHERE"
WHITESPACE " "
BIN_EXPR
NAME_REF
IDENT "\"language\""
WHITESPACE " "
EQ "="
WHITESPACE " "
LITERAL
STRING "'nl-NL'"
WHITESPACE " "
ORDER_BY_CLAUSE
ORDER_KW "ORDER"
WHITESPACE " "
BY_KW "BY"
WHITESPACE " "
NAME_REF
IDENT "\"id\""
WHITESPACE " "
ASC_KW "ASC"
WHITESPACE " "
LIMIT_CLAUSE
LIMIT_KW "LIMIT"
WHITESPACE " "
LITERAL
INT_NUMBER "1"
WHITESPACE "\n"
R_PAREN ")"
WHITESPACE " "
LIMIT_CLAUSE
LIMIT_KW "LIMIT"
WHITESPACE " "
LITERAL
INT_NUMBER "1"
SEMICOLON ";"
WHITESPACE "\n"
12 changes: 12 additions & 0 deletions crates/squawk_parser/test_data/ok/select_compound_union_select.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
SELECT (
(SELECT id FROM code_categories WHERE "language" = @language::char(4) ORDER BY "id" ASC LIMIT 1)
UNION
(SELECT id FROM code_categories WHERE "language" = 'nl-NL' ORDER BY "id" ASC LIMIT 1)
) LIMIT 1;

-- version without parentheses.
SELECT (
(SELECT id FROM code_categories WHERE "language" = @language::char(4) ORDER BY "id" ASC LIMIT 1)
UNION
SELECT id FROM code_categories WHERE "language" = 'nl-NL' ORDER BY "id" ASC LIMIT 1
) LIMIT 1;
Loading