Skip to content

ide: cte error handling improvements #881

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
Jan 22, 2026
Merged

ide: cte error handling improvements #881

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
1a5b97f
ide: cte error handling improvements
sbdchd Jan 22, 2026
38246cd
fix
sbdchd Jan 22, 2026
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_parser/src/grammar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2559,6 +2559,9 @@ const COMPOUND_SELECT_FIRST: TokenSet = TokenSet::new(&[UNION_KW, INTERSECT_KW,
// [ SEARCH { BREADTH | DEPTH } FIRST BY column_name [, ...] SET search_seq_col_name ]
// [ CYCLE column_name [, ...] SET cycle_mark_col_name [ TO cycle_mark_value DEFAULT cycle_mark_default ] USING cycle_path_col_name ]
fn with_query(p: &mut Parser<'_>) -> CompletedMarker {
if p.at(WITH_KW) {
p.err_and_bump("unexpected WITH");
}
let m = p.start();
name(p);
opt_column_list_with(p, ColumnDefKind::Name);
Expand Down
5 changes: 5 additions & 0 deletions crates/squawk_parser/tests/data/err/select_cte.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ with t as (select 1)
search depth first by a, b c set ordercol
select * from t order by ordercol;

-- extra with
with t as (select 1),
with f as (select 2)
select * from t;

with
a as (
select 1
Expand Down
69 changes: 66 additions & 3 deletions crates/squawk_parser/tests/snapshots/tests__select_cte_err.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,65 @@ SOURCE_FILE
IDENT "ordercol"
SEMICOLON ";"
WHITESPACE "\n\n"
COMMENT "-- extra with"
WHITESPACE "\n"
SELECT
WITH_CLAUSE
WITH_KW "with"
WHITESPACE " "
WITH_TABLE
NAME
IDENT "t"
WHITESPACE " "
AS_KW "as"
WHITESPACE " "
L_PAREN "("
SELECT
SELECT_CLAUSE
SELECT_KW "select"
WHITESPACE " "
TARGET_LIST
TARGET
LITERAL
INT_NUMBER "1"
R_PAREN ")"
COMMA ","
WHITESPACE "\n"
ERROR
WITH_KW "with"
WHITESPACE " "
WITH_TABLE
NAME
IDENT "f"
WHITESPACE " "
AS_KW "as"
WHITESPACE " "
L_PAREN "("
SELECT
SELECT_CLAUSE
SELECT_KW "select"
WHITESPACE " "
TARGET_LIST
TARGET
LITERAL
INT_NUMBER "2"
R_PAREN ")"
WHITESPACE "\n"
SELECT_CLAUSE
SELECT_KW "select"
WHITESPACE " "
TARGET_LIST
TARGET
STAR "*"
WHITESPACE " "
FROM_CLAUSE
FROM_KW "from"
WHITESPACE " "
FROM_ITEM
NAME_REF
IDENT "t"
SEMICOLON ";"
WHITESPACE "\n\n"
SELECT
WITH_CLAUSE
WITH_KW "with"
Expand Down Expand Up @@ -345,15 +404,19 @@ error[syntax-error]: expected COMMA
╭▸
13 │ search depth first by a, b c set ordercol
╰╴ ━
error[syntax-error]: unexpected WITH
╭▸
18 │ with f as (select 2)
╰╴━
error[syntax-error]: missing comma
╭▸
19 │ ) -- <-- missing a comma
24 │ ) -- <-- missing a comma
╰╴ ━
error[syntax-error]: missing comma
╭▸
29 │ ) -- <-- missing a comma
34 │ ) -- <-- missing a comma
╰╴ ━
error[syntax-error]: unexpected comma
╭▸
38 │ ), -- <-- extra comma
43 │ ), -- <-- extra comma
╰╴ ━
Loading