Skip to content

gh-88239: Use sqlite3_stmt_busy() to determine if statements are in use #25984

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 16 commits into from
Jun 27, 2022
+3 −18
Merged

gh-88239: Use sqlite3_stmt_busy() to determine if statements are in use #25984

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
952be72
bpo-44073: Use sqlite3_stmt_busy() to check statement status
May 8, 2021
0744c85
Merge branch 'main' into sqlite-stmt-busy
Jun 4, 2021
5cd567c
Test same query in multiple cursors
Mar 2, 2021
5b1fca2
Restore pysqlite_statement_reset optimisation
Jun 4, 2021
97823a8
Merge branch 'main' into sqlite-stmt-busy
Jun 4, 2021
5e66bf9
Revert "Restore pysqlite_statement_reset optimisation"
Jun 4, 2021
6079750
Merge branch 'main' into sqlite-stmt-busy
Jun 6, 2021
4252237
Merge branch 'main' into sqlite-stmt-busy
Jun 8, 2021
1e7015a
Merge branch 'main' into sqlite-stmt-busy
Jun 17, 2021
fe238de
Merge branch 'main' into sqlite-stmt-busy
Aug 14, 2021
09e44b9
Merge branch 'main' into sqlite-stmt-busy
Aug 19, 2021
626e07e
Greatly simplify SQLite statement reset handling:
Aug 19, 2021
969d8b1
Merge branch 'main' into sqlite-stmt-busy
Sep 21, 2021
d23a8da
Merge branch 'main' into sqlite-stmt-busy
Sep 21, 2021
3fe12d5
Merge branch 'main' into sqlite-stmt-busy
erlend-aasland Jun 23, 2022
37bf9ef
Fix merge
erlend-aasland Jun 23, 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
Merge branch 'main' into sqlite-stmt-busy
  • Loading branch information
Erlend E. Aasland committed Jun 4, 2021
commit 0744c8520796172627bfebdb14675ba8b9ab8dcb
19 changes: 0 additions & 19 deletions Modules/_sqlite/connection.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1329,25 +1329,6 @@ pysqlite_connection_call(pysqlite_Connection *self, PyObject *args,
return NULL;
}

statement->db = NULL;
statement->st = NULL;
statement->sql = NULL;
statement->in_weakreflist = NULL;

rc = pysqlite_statement_create(statement, self, sql);
if (rc != SQLITE_OK) {
if (rc == PYSQLITE_TOO_MUCH_SQL) {
PyErr_SetString(pysqlite_Warning, "You can only execute one statement at a time.");
} else if (rc == PYSQLITE_SQL_WRONG_TYPE) {
if (PyErr_ExceptionMatches(PyExc_TypeError))
PyErr_SetString(pysqlite_Warning, "SQL is of wrong type. Must be string.");
} else {
(void)pysqlite_statement_reset(statement);
_pysqlite_seterror(self->db);
}
goto error;
}

weakref = PyWeakref_NewRef((PyObject*)statement, NULL);
if (weakref == NULL)
goto error;
Expand Down
3 changes: 0 additions & 3 deletions Modules/_sqlite/statement.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ pysqlite_statement_create(pysqlite_Connection *connection, PyObject *sql)
Py_ssize_t sql_cstr_len;
const char* p;

self->st = NULL;

assert(PyUnicode_Check(sql));

sql_cstr = PyUnicode_AsUTF8AndSize(sql, &sql_cstr_len);
Expand Down Expand Up @@ -89,7 +87,6 @@ pysqlite_statement_create(pysqlite_Connection *connection, PyObject *sql)
self->db = connection->db;
self->st = NULL;
self->sql = Py_NewRef(sql);
self->in_use = 0;
self->is_dml = 0;
self->in_weakreflist = NULL;

Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.