Prevent unexpected combinations of statements and clauses groups from executing #6314
+133
−1
Conversation
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
Collaborator
Author
|
r? @mercmobily |
b8b071a to
802b2b6
Compare
Collaborator
Author
|
(This needs a re-run of the one CI task - it failed on a network error updating coveralls) |
kibertoad
reviewed
Dec 11, 2025
kibertoad
reviewed
Dec 11, 2025
| // here is intentionally not complete; it's just checking the things that allow users | ||
| // to make dangerous errors. | ||
| const invalid = invalidClauses[verb]; | ||
| for (let i = 0; i < invalid.length; i++) { |
Collaborator
Author
There was a problem hiding this comment.
Combination of:
- presuming it's a hot path, so avoiding extra garbage and/or cpu overhead generated by the iterator protocol
- this loop pattern is generally so recognizable that I don't expect it to be a legibility disadvantage
Collaborator
Author
There was a problem hiding this comment.
Let me know if you'd prefer I changed this
kibertoad
reviewed
Dec 11, 2025
kibertoad
reviewed
Dec 11, 2025
kibertoad
requested changes
Dec 11, 2025
Collaborator
kibertoad
left a comment
There was a problem hiding this comment.
this behaviour needs to be documented
… executing Fixes knex#4070 Clauses such as "HAVING" and "WHERE" have no effect on "DELETE" or "TRUNCATE" statements. Due to the architecture of knex, dialects override various base methods for building specific statements. The methods implementing these statements don't explicitly check for the presence of clauses that a user might expect to have an effect, but there isn't a good place to ensure that such queries fail systematically. This commit introduces a "_preValidate" method on the root QueryCompiler class and a set of disallowed verb/clause combinations that will throw an error before doing any SQL-building work. This should make it consistent to prevent anything like `knex.having(...).del()` from unintentionally deleting all rows. The current configuration disallows "HAVING" from "DELETE" statements, and both "WHERE" and "HAVING" from "TRUNCATE" statements.
sqlite and mssql technically support these, but support is not implemented in knex yet
- Move delete + limit test to unit test - Consolidate "invalid combination" tests - Also exercise "implied" where/having
e7f575f to
1f51849
Compare
Collaborator
Author
|
(rebased onto master) |
kibertoad
approved these changes
Dec 23, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Fixes #4070, #6074
Clauses such as "HAVING" and "WHERE" have no effect on "DELETE" or "TRUNCATE" statements. Due to the architecture of knex, dialects override various base methods for building specific statements. The methods implementing these statements don't explicitly check for the presence of clauses that a user might expect to have an effect, but there isn't a good place to ensure that such queries fail systematically.
This commit introduces a "_preValidate" method on the root QueryCompiler class and a set of disallowed verb/clause combinations that will throw an error before doing any SQL-building work. This should make it consistent to prevent anything like
knex.having(...).del()from unintentionally deleting all rows.The current configuration disallows "HAVING" from "DELETE" statements, and both "WHERE" and "HAVING" from "TRUNCATE" statements.
Update:
Now also rejects "LIMIT" from "DELETE" and "TRUNCATE"
DRI:@myndzi