RAG-NOJIRA: validate structured SQL fragments - #169
Merged
Conversation
Reject unsafe identifiers and clause values at runtime while requiring Raw for trusted inline SQL expressions.
Keep existing field SQL strings unchanged while binding ordinary clause values and inlining explicit Raw parameters with dialect-safe placeholder tracking.
Merged
G4brym
pushed a commit
that referenced
this pull request
Jul 24, 2026
This PR was opened by the [Changesets release](https://github.com/changesets/action) GitHub action. When you're ready to do a release, you can merge this and the packages will be published to npm automatically. If you're not ready to do a release yet, that's fine, whenever you add more changesets to main, this PR will be updated. # Releases ## workers-qb@1.15.0 ### Minor Changes - [#169](#169) [`5c9bdc0`](5c9bdc0) Thanks [@G4brym](https://github.com/G4brym)! - Harden structured SQL inputs against injection while preserving existing `fields` expressions. Table and column identifiers, aliases, CTE names, join types and conditions, conflict modes, set operations, ordering, limits, and offsets are now validated before SQL generation. Bound values now receive unique parameter positions across CTEs, subqueries, `WHERE`, and `HAVING`. Queries that previously reused the same numbered position across clauses may consume more bound-parameter slots; D1 and SQLite-backed Durable Objects allow up to 100 per query. ## Upgrade notes - Existing SQL expressions passed through `fields` continue to work without changes. - Plain `groupBy`, `distinct`, and `returning` values must be identifiers. Plain `orderBy` values must be identifiers with an optional `ASC` or `DESC` direction, and join conditions must use simple comparisons joined by `AND` or `OR`. Wrap more complex, trusted expressions in `Raw`. - Ordinary `WHERE` and `HAVING` values remain bound parameters. Passing `Raw` in a parameter position now explicitly inlines trusted SQL and must never be used with request-controlled input. - Split or batch D1 and Durable Object queries that can exceed 100 independently supplied bound values. - Custom database adapters must execute `query.toStatement('sqlite')` or `query.toStatement('postgres')` instead of `query.query` so nested parameters retain unique binding positions. Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
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
1 participant
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.
Summary
fieldsSQL expressions without requiringRawRawvalues in data,WHERE, andHAVINGparameters?operatorsCompatibility
Existing field expressions and all pre-existing tests remain unchanged.
Rawis only needed when a value passed through a parameter position should be inlined instead of bound.Verification
npm run lintnpm testnpm run buildnpm run docs:buildgit diff --check