Skip to content

bpo-42972: Track sqlite3 statement objects #26475

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
vstinner merged 5 commits into from
Jun 1, 2021
+40 −48
Merged

bpo-42972: Track sqlite3 statement objects #26475

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
36ae3eb
bpo-42972: Track sqlite3 statement objects
May 31, 2021
1b0f583
Allocate and track statement objects in pysqlite_statement_create
Jun 1, 2021
0a6ca75
Remove now unused constants
Jun 1, 2021
df284eb
Improve error message
Jun 1, 2021
4f03b79
Group and order member initialisation
Jun 1, 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
Group and order member initialisation
  • Loading branch information
Erlend E. Aasland committed Jun 1, 2021
commit 4f03b79a16f4dfdd3923c090f00a132cd71421dc
8 changes: 4 additions & 4 deletions Modules/_sqlite/statement.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,15 @@ pysqlite_statement_create(pysqlite_Connection *connection, PyObject *sql)
return NULL;
}

self->db = connection->db;
self->st = NULL;
self->sql = Py_NewRef(sql);
self->in_use = 0;
self->is_dml = 0;
self->in_weakreflist = NULL;
self->sql = Py_NewRef(sql);

/* Determine if the statement is a DML statement.
SELECT is the only exception. See #9924. */
self->is_dml = 0;
for (p = sql_cstr; *p != 0; p++) {
switch (*p) {
case ' ':
Expand All @@ -103,14 +104,13 @@ pysqlite_statement_create(pysqlite_Connection *connection, PyObject *sql)
}

Py_BEGIN_ALLOW_THREADS
rc = sqlite3_prepare_v2(connection->db,
rc = sqlite3_prepare_v2(self->db,
sql_cstr,
-1,
&self->st,
&tail);
Py_END_ALLOW_THREADS

self->db = connection->db;
PyObject_GC_Track(self);

if (rc != SQLITE_OK) {
Expand Down