summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErlend Egeberg Aasland <erlend.aasland@innova.no>2022-01-03 23:47:16 (GMT)
committerGitHub <noreply@github.com>2022-01-03 23:47:16 (GMT)
commitf1a58441eea6b7788c64d03a80ea35996301e550 (patch)
tree0007a8374b79bee55f282077466120f8707b7e07
parent2db56130631255ca2eb504519430fb2f1fe789e9 (diff)
downloadcpython-f1a58441eea6b7788c64d03a80ea35996301e550.zip
cpython-f1a58441eea6b7788c64d03a80ea35996301e550.tar.gz
cpython-f1a58441eea6b7788c64d03a80ea35996301e550.tar.bz2
bpo-44092: Remove unused member `reset` from `sqlite3.Cursor` (GH-30377)
Automerge-Triggered-By: GH:pablogsal
-rw-r--r--Modules/_sqlite/cursor.c19
-rw-r--r--Modules/_sqlite/cursor.h1
2 files changed, 0 insertions, 20 deletions
diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c
index e475d93..2729a85 100644
--- a/Modules/_sqlite/cursor.c
+++ b/Modules/_sqlite/cursor.c
@@ -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
@@ -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);
@@ -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
@@ -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)) {
@@ -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);
@@ -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;
}
diff --git a/Modules/_sqlite/cursor.h b/Modules/_sqlite/cursor.h
index d26d20a..0bcdddc 100644
--- a/Modules/_sqlite/cursor.h
+++ b/Modules/_sqlite/cursor.h
@@ -42,7 +42,6 @@ typedef struct
PyObject* row_factory;
pysqlite_Statement* statement;
int closed;
- int reset;
int locked;
int initialized;