Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

bpo-44092: Remove unused member reset from sqlite3.Cursor #30377

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
miss-islington merged 1 commit into from
Jan 3, 2022
Merged

bpo-44092: Remove unused member reset from sqlite3.Cursor #30377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 0 additions & 19 deletions 19 Modules/_sqlite/cursor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ class _sqlite3.Cursor "pysqlite_Cursor *" "clinic_state()->CursorType"
[clinic start generated code]*/
/*[clinic end generated code: output=da39a3ee5e6b4b0d input=3c5b8115c5cf30f1]*/

static const char errmsg_fetch_across_rollback[] = "Cursor needed to be reset because of commit/rollback and can no longer be fetched from.";

/*[clinic input]
_sqlite3.Cursor.__init__ as pysqlite_cursor_init

Expand All @@ -63,8 +61,6 @@ pysqlite_cursor_init_impl(pysqlite_Cursor *self,

self->arraysize = 1;
self->closed = 0;
self->reset = 0;

self->rowcount = -1L;

Py_INCREF(Py_None);
Expand Down Expand Up @@ -273,12 +269,6 @@ _pysqlite_fetch_one_row(pysqlite_Cursor* self)
const char* colname;
PyObject* error_msg;

if (self->reset) {
PyObject *exc = self->connection->InterfaceError;
PyErr_SetString(exc, errmsg_fetch_across_rollback);
return NULL;
}

Py_BEGIN_ALLOW_THREADS
numcols = sqlite3_data_count(self->statement->st);
Py_END_ALLOW_THREADS
Expand Down Expand Up @@ -482,7 +472,6 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
}

self->locked = 1;
self->reset = 0;

if (multiple) {
if (PyIter_Check(second_argument)) {
Expand Down Expand Up @@ -731,8 +720,6 @@ pysqlite_cursor_executescript_impl(pysqlite_Cursor *self,
return NULL;
}

self->reset = 0;

size_t sql_len = strlen(sql_script);
int max_length = sqlite3_limit(self->connection->db,
SQLITE_LIMIT_SQL_LENGTH, -1);
Expand Down Expand Up @@ -797,12 +784,6 @@ pysqlite_cursor_iternext(pysqlite_Cursor *self)
return NULL;
}

if (self->reset) {
PyObject *exc = self->connection->InterfaceError;
PyErr_SetString(exc, errmsg_fetch_across_rollback);
return NULL;
}

if (self->statement == NULL) {
return NULL;
}
Expand Down
1 change: 0 additions & 1 deletion 1 Modules/_sqlite/cursor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ typedef struct
PyObject* row_factory;
pysqlite_Statement* statement;
int closed;
int reset;
int locked;
int initialized;

Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.