Skip to content

bpo-45041: Simplify sqlite3.Cursor.executescript() #28020

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 4 commits into from
Sep 19, 2021
Merged

bpo-45041: Simplify sqlite3.Cursor.executescript() #28020

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a93dcaa
bpo-45041: Simplify sqlite3.Cursor.executemany
Aug 28, 2021
f04bd09
Add test for executescript() tx ctrl
Aug 28, 2021
b92ca72
Revert f04bd092fc5b8d2947534d4845b4bcb0bad819b6
Aug 30, 2021
9db16c3
Merge branch 'main' into sqlite-optimise-executemany
Aug 30, 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
67 changes: 25 additions & 42 deletions Modules/_sqlite/cursor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,19 +729,13 @@ pysqlite_cursor_executescript_impl(pysqlite_Cursor *self,
const char *sql_script)
/*[clinic end generated code: output=8fd726dde1c65164 input=1ac0693dc8db02a8]*/
{
_Py_IDENTIFIER(commit);
sqlite3_stmt* statement;
int rc;
size_t sql_len;
PyObject* result;

if (!check_cursor(self)) {
return NULL;
}

self->reset = 0;

sql_len = strlen(sql_script);
size_t sql_len = strlen(sql_script);
int max_length = sqlite3_limit(self->connection->db,
SQLITE_LIMIT_LENGTH, -1);
if (sql_len >= (unsigned)max_length) {
Expand All @@ -750,47 +744,37 @@ pysqlite_cursor_executescript_impl(pysqlite_Cursor *self,
return NULL;
}

/* commit first */
result = _PyObject_CallMethodIdNoArgs((PyObject *)self->connection, &PyId_commit);
if (!result) {
goto error;
}
Py_DECREF(result);

pysqlite_state *state = self->connection->state;
while (1) {
const char *tail;
// Commit if needed
sqlite3 *db = self->connection->db;
if (!sqlite3_get_autocommit(db)) {
int rc = SQLITE_OK;

Py_BEGIN_ALLOW_THREADS
rc = sqlite3_prepare_v2(self->connection->db,
sql_script,
(int)sql_len + 1,
&statement,
&tail);
rc = sqlite3_exec(db, "COMMIT", NULL, NULL, NULL);
Py_END_ALLOW_THREADS

if (rc != SQLITE_OK) {
_pysqlite_seterror(state, self->connection->db);
goto error;
}
}

/* execute statement, and ignore results of SELECT statements */
do {
rc = pysqlite_step(statement);
if (PyErr_Occurred()) {
(void)sqlite3_finalize(statement);
goto error;
}
} while (rc == SQLITE_ROW);
while (1) {
int rc;
const char *tail;

if (rc != SQLITE_DONE) {
(void)sqlite3_finalize(statement);
_pysqlite_seterror(state, self->connection->db);
goto error;
Py_BEGIN_ALLOW_THREADS
sqlite3_stmt *stmt;
rc = sqlite3_prepare_v2(db, sql_script, (int)sql_len + 1, &stmt,
&tail);
if (rc == SQLITE_OK) {
do {
(void)sqlite3_step(stmt);
} while (rc == SQLITE_ROW);
rc = sqlite3_finalize(stmt);
}
Py_END_ALLOW_THREADS

rc = sqlite3_finalize(statement);
if (rc != SQLITE_OK) {
_pysqlite_seterror(state, self->connection->db);
goto error;
}

Expand All @@ -801,12 +785,11 @@ pysqlite_cursor_executescript_impl(pysqlite_Cursor *self,
sql_script = tail;
}

return Py_NewRef((PyObject *)self);

error:
if (PyErr_Occurred()) {
return NULL;
} else {
return Py_NewRef((PyObject *)self);
}
_pysqlite_seterror(self->connection->state, db);
return NULL;
}

static PyObject *
Expand Down