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

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

Show file tree
Hide file tree
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
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
Rename pysqlite_check_remaining_sql to lstrip_sql
  • Loading branch information
@erlend-aasland
erlend-aasland committed Jun 8, 2022
commit 7fcca68a093a53ef8cc10dc3cd318f30596ad334
7 changes: 6 additions & 1 deletion Lib/test/test_sqlite3/test_dbapi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -906,9 +906,14 @@ def test_rowcount_update_returning(self):
self.assertEqual(self.cu.fetchone()[0], 1)
self.assertEqual(self.cu.rowcount, 1)

@unittest.skip("")
def test_rowcount_prefixed_with_comment(self):
# gh-79579: rowcount is updated even if query is prefixed with comments
self.cu.execute("/* foo */ insert into test(name) values (?)", ('foo',))
#self.cu.execute("/* foo */ insert into test(name) values (?)", ('foo',))
Comment thread
erlend-aasland marked this conversation as resolved.
Outdated
self.cu.execute("""
-- foo
insert into test(name) values ('foo')
""")
self.assertEqual(self.cu.rowcount, 1)
self.cu.execute("/* bar */ update test set name='bar' where name='foo'")
self.assertEqual(self.cu.rowcount, 2)
Expand Down
6 changes: 3 additions & 3 deletions Modules/_sqlite/statement.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include "util.h"

/* prototypes */
static const char *pysqlite_check_remaining_sql(const char *sql);
static const char *lstrip_sql(const char *sql);

typedef enum {
LINECOMMENT_1,
Expand Down Expand Up @@ -73,7 +73,7 @@ pysqlite_statement_create(pysqlite_Connection *connection, PyObject *sql)
return NULL;
}

if (pysqlite_check_remaining_sql(tail)) {
if (lstrip_sql(tail)) {
PyErr_SetString(connection->ProgrammingError,
"You can only execute one statement at a time.");
goto error;
Expand Down Expand Up @@ -147,7 +147,7 @@ stmt_traverse(pysqlite_Statement *self, visitproc visit, void *arg)
* Returns 1 if there is more left than should be. 0 if ok.
*/
static const char *
pysqlite_check_remaining_sql(const char *sql)
lstrip_sql(const char *sql)
{
const char *pos = sql;

Expand Down