Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 23:21:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

bpo-44092: Remove unused member reset from sqlite3.Cursor (GH-30377)

Browse source 
Automerge-Triggered-By: GH:pablogsal
This commit is contained in:
Erlend Egeberg Aasland 2022-01-04 00:47:16 +01:00 • committed by GitHub
parent 2db5613063
commit f1a58441ee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Modules/_sqlite/cursor.c
View file

@ -35,8 +35,6 @@ class _sqlite3.Cursor "pysqlite_Cursor *" "clinic_state()->CursorType"
[clinic start generated code]*/ [clinic start generated code]*/
/*[clinic end generated code: output=da39a3ee5e6b4b0d input=3c5b8115c5cf30f1]*/ /*[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] /*[clinic input]
_sqlite3.Cursor.__init__ as pysqlite_cursor_init _sqlite3.Cursor.__init__ as pysqlite_cursor_init
@ -63,8 +61,6 @@ pysqlite_cursor_init_impl(pysqlite_Cursor *self,
self->arraysize = 1; self->arraysize = 1;
self->closed = 0; self->closed = 0;
self->reset = 0;
self->rowcount = -1L; self->rowcount = -1L;
Py_INCREF(Py_None); Py_INCREF(Py_None);
@ -273,12 +269,6 @@ _pysqlite_fetch_one_row(pysqlite_Cursor* self)
const char* colname; const char* colname;
PyObject* error_msg; PyObject* error_msg;
if (self->reset) {
PyObject *exc = self->connection->InterfaceError;
PyErr_SetString(exc, errmsg_fetch_across_rollback);
return NULL;
}
Py_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS
numcols = sqlite3_data_count(self->statement->st); numcols = sqlite3_data_count(self->statement->st);
Py_END_ALLOW_THREADS Py_END_ALLOW_THREADS
@ -482,7 +472,6 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
} }
self->locked = 1; self->locked = 1;
self->reset = 0;
if (multiple) { if (multiple) {
if (PyIter_Check(second_argument)) { if (PyIter_Check(second_argument)) {
@ -731,8 +720,6 @@ pysqlite_cursor_executescript_impl(pysqlite_Cursor *self,
return NULL; return NULL;
} }
self->reset = 0;
size_t sql_len = strlen(sql_script); size_t sql_len = strlen(sql_script);
int max_length = sqlite3_limit(self->connection->db, int max_length = sqlite3_limit(self->connection->db,
SQLITE_LIMIT_SQL_LENGTH, -1); SQLITE_LIMIT_SQL_LENGTH, -1);
@ -797,12 +784,6 @@ pysqlite_cursor_iternext(pysqlite_Cursor *self)
return NULL; return NULL;
} }
if (self->reset) {
PyObject *exc = self->connection->InterfaceError;
PyErr_SetString(exc, errmsg_fetch_across_rollback);
return NULL;
}
if (self->statement == NULL) { if (self->statement == NULL) {
return NULL; return NULL;
} }

1
Modules/_sqlite/cursor.h
View file

@ -42,7 +42,6 @@ typedef struct
PyObject* row_factory; PyObject* row_factory;
pysqlite_Statement* statement; pysqlite_Statement* statement;
int closed; int closed;
int reset;
int locked; int locked;
int initialized; int initialized;