Skip to content

feat: support SOQL SET OPTIONS literals and query options binds #167

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
kjonescertinia merged 2 commits into from
Oct 2, 2026
Merged

feat: support SOQL SET OPTIONS literals and query options binds #167

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
48b9ae4
feat: support documented SOQL SET OPTIONS and query options binds
nawforce Oct 1, 2026
a9d5908
fix: preserve normal SOQL query options bind expressions
nawforce Oct 1, 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 antlr/BaseApexLexer.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,9 @@ HAVING : 'having';
ROLLUP : 'rollup';
TOLABEL : 'tolabel';
OFFSET : 'offset';
OPTIONS : 'options';
DATASPACE : 'dataspace';
HONOR_EMPTY_STRINGS : 'honoremptystrings';
DATA : 'data';
CATEGORY : 'category';
AT : 'at';
Expand Down
19 changes: 19 additions & 0 deletions antlr/BaseApexParser.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,6 +598,7 @@ query
allRowsClause?
forClauses
(UPDATE updateList)?
setOptionsClause?
;

subQuery
Expand Down Expand Up @@ -819,6 +820,18 @@ forClauses
boundExpression
: COLON expression;

// SET OPTIONS is terminal. Literal options are for standalone SOQL, not inline Apex.
// explicitNamespace is configured through Database.QueryOptions, not a literal option.
setOptionsClause
: SET OPTIONS ({this.isStandaloneQuery()}? LPAREN queryOption (COMMA queryOption)* RPAREN
| boundExpression)
;

queryOption
: DATASPACE ASSIGN StringLiteral
| HONOR_EMPTY_STRINGS ASSIGN BooleanLiteral
;

dateFormula
: YESTERDAY
| TODAY
Expand Down Expand Up @@ -1007,6 +1020,9 @@ id
| ROLLUP
| TOLABEL
| OFFSET
| OPTIONS
| DATASPACE
| HONOR_EMPTY_STRINGS
| DATA
| CATEGORY
| AT
Expand Down Expand Up @@ -1210,6 +1226,9 @@ anyId
| ROLLUP
| TOLABEL
| OFFSET
| OPTIONS
| DATASPACE
| HONOR_EMPTY_STRINGS
| DATA
| CATEGORY
| AT
Expand Down
Loading
Loading