8000 gh-79579: Improve DML query detection in sqlite3 by erlend-aasland · Pull Request #93623 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-79579: Improve DML query detection in sqlite3 #93623

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
merged 22 commits into from
Jun 14, 2022
Merged

gh-79579: Improve DML query detection in sqlite3 #93623

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
c8bcf3b
Add tests
erlend-aasland Jun 8, 2022
d38e632
Modify pysqlite_check_remaining_sql to return char * iso. int
erlend-aasland Jun 8, 2022
7fcca68
Rename pysqlite_check_remaining_sql to lstrip_sql
erlend-aasland Jun 8, 2022
3061dc5
Use lstrip_sql() to strip comments and whitespace
erlend-aasland Jun 8, 2022
631f24d
Adjust comment
erlend-aasland Jun 8, 2022
8f29283
Explicit comparison
erlend-aasland Jun 8, 2022
a51cfe6
Add more tests
erlend-aasland Jun 8, 2022
bf0e150
Fix bug in lstrip parser
erlend-aasland Jun 8, 2022
5918fbe
Adjust NEWS
erlend-aasland Jun 8, 2022
b45e5b5
Make test more messy
erlend-aasland Jun 9, 2022
b0a7fbc
Address Ma Lin's review
erlend-aasland Jun 9, 2022
61a81eb
Reword comment
erlend-aasland Jun 9, 2022
e3fea31
Inline it
erlend-aasland Jun 9, 2022
d6ce75c
Further mess up messy test to increase code coverage
erlend-aasland Jun 9, 2022
7f7943f
Increase code coverage
erlend-aasland Jun 10, 2022
adcba2c
Merge branch 'main' into sqlite-rowcount/gh-79579-alt
erlend-aasland Jun 12, 2022
e5fafc7
Rewrite lstrip_sql by borrowing from SQLite's parser
erlend-aasland Jun 13, 2022
7d7a654
Test code nit
erlend-aasland Jun 13, 2022
2e638a0
Harden test_rowcount_prefixed_with_comment test
erlend-aasland Jun 13, 2022
b932e4f
Simplify one test
erlend-aasland Jun 13, 2022
ca053d7
Fix ret value for invalid comments 8000
erlend-aasland Jun 13, 2022
c6fa9b2
Simplify
erlend-aasland Jun 13, 2022
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
Prev Previous commit
Next Next commit
Reword comment
  • Loading branch information
@erlend-aasland
erlend-aasland committed Jun 9, 2022
commit 61a81eb23ca6212edcd7c05fd858898f2938a87b
10 changes: 4 additions & 6 deletions Modules/_sqlite/statement.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,15 +131,13 @@ stmt_traverse(pysqlite_Statement *self, visitproc visit, void *arg)
}

/*
* Strips leading whitespace and SQL comments from input string and returns a
* Strip leading whitespace and comments from SQL string and return a
* pointer to the first non-whitespace, non-comment character.
*
* This is used to check if somebody tried to execute more than one SQL command
* with one execute()/executemany() command, which the DB-API and we don't
* allow.
* This is used to check if somebody tries to execute more than one SQL query
* with one execute()/executemany() command, which the DB-API don't allow.
*
* It is also used to strip leading whitespace and comments from input SQL
* queries, so we can easily detect DML queries.
* It is also used to harden DML query detection.
*/
static const char *
lstrip_sql(const char *sql)
Expand Down
0