mig5/bouquin-sqlcipher4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Small changes w/correspondent in pysqlite3.

Browse source
This commit is contained in:
Charles Leifer 2021-04-26 17:21:08 -05:00
parent 44f1c39205
commit 0cfea11bb4
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/connection.c
View file

@ -460,11 +460,10 @@ int pysqlite_check_connection(pysqlite_Connection* con)
PyObject* _pysqlite_connection_begin(pysqlite_Connection* self) PyObject* _pysqlite_connection_begin(pysqlite_Connection* self)
{ {
int rc; int rc;
const char* tail;
sqlite3_stmt* statement; sqlite3_stmt* statement;
Py_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS
rc = sqlite3_prepare_v2(self->db, self->begin_statement, -1, &statement, &tail); rc = sqlite3_prepare_v2(self->db, self->begin_statement, -1, &statement, NULL);
Py_END_ALLOW_THREADS Py_END_ALLOW_THREADS
if (rc != SQLITE_OK) { if (rc != SQLITE_OK) {
@ -496,7 +495,6 @@ error:
PyObject* pysqlite_connection_commit(pysqlite_Connection* self, PyObject* args) PyObject* pysqlite_connection_commit(pysqlite_Connection* self, PyObject* args)
{ {
int rc; int rc;
const char* tail;
sqlite3_stmt* statement; sqlite3_stmt* statement;
if (!pysqlite_check_thread(self) || !pysqlite_check_connection(self)) { if (!pysqlite_check_thread(self) || !pysqlite_check_connection(self)) {
@ -506,7 +504,7 @@ PyObject* pysqlite_connection_commit(pysqlite_Connection* self, PyObject* args)
if (!sqlite3_get_autocommit(self->db)) { if (!sqlite3_get_autocommit(self->db)) {
Py_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS
rc = sqlite3_prepare_v2(self->db, "COMMIT", -1, &statement, &tail); rc = sqlite3_prepare_v2(self->db, "COMMIT", -1, &statement, NULL);
Py_END_ALLOW_THREADS Py_END_ALLOW_THREADS
if (rc != SQLITE_OK) { if (rc != SQLITE_OK) {
_pysqlite_seterror(self->db, NULL); _pysqlite_seterror(self->db, NULL);
@ -538,7 +536,6 @@ error:
PyObject* pysqlite_connection_rollback(pysqlite_Connection* self, PyObject* args) PyObject* pysqlite_connection_rollback(pysqlite_Connection* self, PyObject* args)
{ {
int rc; int rc;
const char* tail;
sqlite3_stmt* statement; sqlite3_stmt* statement;
if (!pysqlite_check_thread(self) || !pysqlite_check_connection(self)) { if (!pysqlite_check_thread(self) || !pysqlite_check_connection(self)) {
@ -549,7 +546,7 @@ PyObject* pysqlite_connection_rollback(pysqlite_Connection* self, PyObject* args
pysqlite_do_all_statements(self, ACTION_RESET, 1); pysqlite_do_all_statements(self, ACTION_RESET, 1);
Py_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS
rc = sqlite3_prepare_v2(self->db, "ROLLBACK", -1, &statement, &tail); rc = sqlite3_prepare_v2(self->db, "ROLLBACK", -1, &statement, NULL);
Py_END_ALLOW_THREADS Py_END_ALLOW_THREADS
if (rc != SQLITE_OK) { if (rc != SQLITE_OK) {
_pysqlite_seterror(self->db, NULL); _pysqlite_seterror(self->db, NULL);