Skip to content

parser: fix parsing insert select on conflict part 2 #721

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 3 commits into from
Dec 5, 2025
Merged

parser: fix parsing insert select on conflict part 2 #721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ed4f2e
parser: fix parsing insert select on conflict
sbdchd Dec 5, 2025
36d130a
more changes
sbdchd Dec 5, 2025
8c0e932
Merge branch 'master' of github.com:sbdchd/squawk into steved-fix-par…
sbdchd Dec 5, 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
4 changes: 3 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 @@ -3456,7 +3456,9 @@ fn join(p: &mut Parser<'_>) {
if !opt_from_item(p) {
p.error("expected from_item");
}
if p.at(ON_KW) && !p.nth_at(1, CONFLICT_KW) {
// need to check that we're not actually at the on_conflict clause in an
// insert/update statement
if p.at(ON_KW) && !(p.nth_at(1, CONFLICT_KW) && matches!(p.nth(2), DO_KW | ON_KW | L_PAREN)) {
on_clause(p);
} else if p.at(USING_KW) {
join_using_clause(p);
Expand Down
21 changes: 20 additions & 1 deletion crates/squawk_parser/tests/data/ok/insert.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,4 +99,23 @@ INSERT INTO t
SELECT *
FROM t
CROSS JOIN f
ON CONFLICT DO NOTHING;
ON CONFLICT
DO NOTHING;

insert into t
select * from u join i
on conflict = conflict
on conflict
do nothing;

insert into t
select * from u join i
on conflict = conflict
on conflict (foo)
do nothing;

insert into t
select * from u join i
on conflict = conflict
on conflict
on constraint temporal_rng_pk do nothing;
189 changes: 188 additions & 1 deletion crates/squawk_parser/tests/snapshots/tests__insert_ok.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1508,10 +1508,197 @@ SOURCE_FILE
ON_KW "ON"
WHITESPACE " "
CONFLICT_KW "CONFLICT"
WHITESPACE " "
WHITESPACE "\n "
CONFLICT_DO_NOTHING
DO_KW "DO"
WHITESPACE " "
NOTHING_KW "NOTHING"
SEMICOLON ";"
WHITESPACE "\n\n"
INSERT
INSERT_KW "insert"
WHITESPACE " "
INTO_KW "into"
WHITESPACE " "
PATH
PATH_SEGMENT
NAME_REF
IDENT "t"
WHITESPACE " \n"
SELECT
SELECT_CLAUSE
SELECT_KW "select"
WHITESPACE " "
TARGET_LIST
TARGET
STAR "*"
WHITESPACE " "
FROM_CLAUSE
FROM_KW "from"
WHITESPACE " "
JOIN_EXPR
FROM_ITEM
NAME_REF
IDENT "u"
WHITESPACE " "
JOIN
JOIN_INNER
JOIN_KW "join"
WHITESPACE " "
FROM_ITEM
NAME_REF
IDENT "i"
WHITESPACE " \n"
ON_CLAUSE
ON_KW "on"
WHITESPACE " "
BIN_EXPR
NAME_REF
CONFLICT_KW "conflict"
WHITESPACE " "
EQ "="
WHITESPACE " "
NAME_REF
CONFLICT_KW "conflict"
WHITESPACE "\n"
ON_CONFLICT_CLAUSE
ON_KW "on"
WHITESPACE " "
CONFLICT_KW "conflict"
WHITESPACE "\n "
CONFLICT_DO_NOTHING
DO_KW "do"
WHITESPACE " "
NOTHING_KW "nothing"
SEMICOLON ";"
WHITESPACE "\n\n"
INSERT
INSERT_KW "insert"
WHITESPACE " "
INTO_KW "into"
WHITESPACE " "
PATH
PATH_SEGMENT
NAME_REF
IDENT "t"
WHITESPACE " \n"
SELECT
SELECT_CLAUSE
SELECT_KW "select"
WHITESPACE " "
TARGET_LIST
TARGET
STAR "*"
WHITESPACE " "
FROM_CLAUSE
FROM_KW "from"
WHITESPACE " "
JOIN_EXPR
FROM_ITEM
NAME_REF
IDENT "u"
WHITESPACE " "
JOIN
JOIN_INNER
JOIN_KW "join"
WHITESPACE " "
FROM_ITEM
NAME_REF
IDENT "i"
WHITESPACE " \n"
ON_CLAUSE
ON_KW "on"
WHITESPACE " "
BIN_EXPR
NAME_REF
CONFLICT_KW "conflict"
WHITESPACE " "
EQ "="
WHITESPACE " "
NAME_REF
CONFLICT_KW "conflict"
WHITESPACE "\n"
ON_CONFLICT_CLAUSE
ON_KW "on"
WHITESPACE " "
CONFLICT_KW "conflict"
WHITESPACE " "
CONFLICT_ON_INDEX
CONFLICT_INDEX_ITEM_LIST
L_PAREN "("
CONFLICT_INDEX_ITEM
NAME_REF
IDENT "foo"
R_PAREN ")"
WHITESPACE "\n "
CONFLICT_DO_NOTHING
DO_KW "do"
WHITESPACE " "
NOTHING_KW "nothing"
SEMICOLON ";"
WHITESPACE "\n\n"
INSERT
INSERT_KW "insert"
WHITESPACE " "
INTO_KW "into"
WHITESPACE " "
PATH
PATH_SEGMENT
NAME_REF
IDENT "t"
WHITESPACE " \n"
SELECT
SELECT_CLAUSE
SELECT_KW "select"
WHITESPACE " "
TARGET_LIST
TARGET
STAR "*"
WHITESPACE " "
FROM_CLAUSE
FROM_KW "from"
WHITESPACE " "
JOIN_EXPR
FROM_ITEM
NAME_REF
IDENT "u"
WHITESPACE " "
JOIN
JOIN_INNER
JOIN_KW "join"
WHITESPACE " "
FROM_ITEM
NAME_REF
IDENT "i"
WHITESPACE " \n"
ON_CLAUSE
ON_KW "on"
WHITESPACE " "
BIN_EXPR
NAME_REF
CONFLICT_KW "conflict"
WHITESPACE " "
EQ "="
WHITESPACE " "
NAME_REF
CONFLICT_KW "conflict"
WHITESPACE "\n"
ON_CONFLICT_CLAUSE
ON_KW "on"
WHITESPACE " "
CONFLICT_KW "conflict"
WHITESPACE "\n "
CONFLICT_ON_CONSTRAINT
ON_KW "on"
WHITESPACE " "
CONSTRAINT_KW "constraint"
WHITESPACE " "
NAME_REF
IDENT "temporal_rng_pk"
WHITESPACE " "
CONFLICT_DO_NOTHING
DO_KW "do"
WHITESPACE " "
NOTHING_KW "nothing"
SEMICOLON ";"
WHITESPACE "\n"
Loading