Skip to content

[WIP] gh-81040: use sqlite3_stmt_readonly() to detect DML statements #24492

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

Closed
erlend-aasland wants to merge 15 commits into from
Closed

[WIP] gh-81040: use sqlite3_stmt_readonly() to detect DML statements #24492

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
11e9829
Use sqlite3_stmt_readonly API to determine is statement is DML.
coleifer May 9, 2019
29a7e20
Skip dml detection + sql comment for old sqlite.
coleifer May 9, 2019
f20d41b
Add news item.
coleifer May 9, 2019
868b97a
Address review comments, additional regression test.
coleifer May 9, 2019
a13fb71
Fix rest markup
berkerpeksag May 9, 2019
6e1cf06
cosmetic fixes
berkerpeksag May 9, 2019
013e43b
Ensure all non-DML statements that write are covered.
coleifer May 9, 2019
6e6f2a0
Move DML detection tests into transactions test module.
coleifer May 10, 2019
09cac6c
Fix version-check for sqlite3_stmt_readonly availability.
coleifer May 11, 2019
d1efa55
Sync with GH-24106
Feb 9, 2021
3645ccc
Merge branch 'main' into bpo-36859
Jun 5, 2021
dce7ada
PEP 7
Jun 5, 2021
7c01d5a
Merge branch 'main' into bpo-36859
Jun 8, 2021
6eb6ec9
Improve namespace
Jun 8, 2021
1bdefdd
Merge branch 'main' into bpo-36859
Jun 15, 2021
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
Merge branch 'main' into bpo-36859
  • Loading branch information
Erlend E. Aasland
Erlend E. Aasland committed Jun 8, 2021
commit 7c01d5ad58dae03b60632db6f8c27d52f914c437
22 changes: 9 additions & 13 deletions Modules/_sqlite/statement.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,6 @@ pysqlite_statement_is_dml(sqlite3_stmt *statement, const char *sql)
pysqlite_Statement *
pysqlite_statement_create(pysqlite_Connection *connection, PyObject *sql)
{
const char* tail;
int rc;
const char* sql_cstr;
Py_ssize_t sql_cstr_len;

assert(PyUnicode_Check(sql));
Py_ssize_t size;
const char *sql_cstr = PyUnicode_AsUTF8AndSize(sql, &size);
Expand Down Expand Up @@ -126,15 +121,16 @@ pysqlite_statement_create(pysqlite_Connection *connection, PyObject *sql)
goto error;
}

Py_BEGIN_ALLOW_THREADS
rc = sqlite3_prepare_v2(self->db,
sql_cstr,
(int)sql_cstr_len + 1,
&self->st,
&tail);
Py_END_ALLOW_THREADS
pysqlite_Statement *self = PyObject_GC_New(pysqlite_Statement,
pysqlite_StatementType);
if (self == NULL) {
goto error;
}

self->is_dml = pysqlite_statement_is_dml(self->st, sql_cstr);
self->st = stmt;
self->in_use = 0;
self->is_dml = pysqlite_statement_is_dml(stmt, sql_cstr);
self->in_weakreflist = NULL;

PyObject_GC_Track(self);
return self;
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.