Repository navigation
feat: parse INSERT OR ABORT, FAIL, IGNORE and ROLLBACK (SQLite) - #2853
Open
ItsDeadlyProgrammer wants to merge 2 commits into
Open
ItsDeadlyProgrammer wants to merge 2 commits into
ItsDeadlyProgrammer wants to merge 2 commits into
Conversation
manticore-projects
requested changes
Oct 23, 2026
| ( | ||
| <K_INSERT> <K_OR> <K_REPLACE> { upsert.setUpsertType(UpsertType.INSERT_OR_REPLACE); } | ||
| <K_INSERT> <K_OR> | ||
| ( |
Contributor
There was a problem hiding this comment.
I do understand that this is SQLite specific syntax. If my understanding is correct, then please guard this block by the SQLite Dialect.
Author
There was a problem hiding this comment.
Thanks, done in 8805d37. There was no SQLite value in Dialect, so I added Dialect.SQLITE and listed it in the dialect table in usage.rst.
INSERT OR IGNORE, ROLLBACK, ABORT and FAIL now parse only with Dialect.SQLITE; other dialects get a ParseException saying so. INSERT OR REPLACE still parses everywhere, because it did before this PR. The tests cover both cases, and the checks are green.
UpsertType and the deparsers already had these values, but the grammar only accepted INSERT OR REPLACE. Part of JSQLParser#2852
Add Dialect.SQLITE. INSERT OR ABORT, FAIL, IGNORE and ROLLBACK need it. INSERT OR REPLACE keeps parsing in every dialect.
ItsDeadlyProgrammer
force-pushed
the
feat/sqlite-insert-or-conflict
branch
from
October 23, 2026 10:57
589893e to
8805d37
Compare
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Part of #2852 (the
INSERT ORhalf;UPDATE OR ...,WITHOUT ROWIDandSTRICTare not in this PR).UpsertTypealready hasINSERT_OR_ABORT,INSERT_OR_FAIL,INSERT_OR_IGNOREandINSERT_OR_ROLLBACK, andUpsertandUpsertDeParserprint them, but the grammar only acceptedINSERT OR REPLACE. This adds the other four to theUpsertproduction.ABORTandFAILare not keywords of the parser, so they are read as identifiers and checked by name; any other word afterINSERT ORis a parse error.SQLiteTestcovers all five algorithms with column list andSELECTsource, a lower case variant, and an unknown word. The four new cases fail without the grammar change. The full./gradlew testrun has 35 failures (StatementDeParserTest, ExpressionDeParserTest, WithFunctionDeclarationTest and others); they fail the same way on an unmodifiedmasterhere (JDK 25), none involve INSERT OR.