psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2025-01-31 17:34:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

Dropped no_begin handling in async execute

Browse Source 
no_begin is only used with withhold named cursors, and it's not possible
to create named cursors on async connections.
This commit is contained in:
Daniele Varrazzo 2019-03-07 22:09:59 +00:00
parent 0935c9d8ca
commit 5467f65122
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
psycopg/pqpath.c
View File

@ -940,10 +940,8 @@ _pq_execute_sync(cursorObject *curs, const char *query, int no_result, int no_be
} }
RAISES_NEG int RAISES_NEG int
_pq_execute_async(cursorObject *curs, const char *query, int no_result, int no_begin) _pq_execute_async(cursorObject *curs, const char *query, int no_result)
{ {
PGresult *pgres = NULL;
char *error = NULL;
int async_status = ASYNC_WRITE; int async_status = ASYNC_WRITE;
int ret; int ret;
@ -952,15 +950,6 @@ _pq_execute_async(cursorObject *curs, const char *query, int no_result, int no_b
Py_BEGIN_ALLOW_THREADS; Py_BEGIN_ALLOW_THREADS;
pthread_mutex_lock(&(curs->conn->lock)); pthread_mutex_lock(&(curs->conn->lock));
/* TODO: is this needed here? */
if (!no_begin && pq_begin_locked(curs->conn, &pgres, &error, &_save) < 0) {
pthread_mutex_unlock(&(curs->conn->lock));
Py_BLOCK_THREADS;
pq_complete_error(curs->conn, &pgres, &error);
return -1;
}
Dprintf("pq_execute: executing ASYNC query: pgconn = %p", curs->conn->pgconn); Dprintf("pq_execute: executing ASYNC query: pgconn = %p", curs->conn->pgconn);
Dprintf(" %-.200s", query); Dprintf(" %-.200s", query);
@ -1028,7 +1017,7 @@ pq_execute(cursorObject *curs, const char *query, int async, int no_result, int
if (!async) { if (!async) {
return _pq_execute_sync(curs, query, no_result, no_begin); return _pq_execute_sync(curs, query, no_result, no_begin);
} else { } else {
return _pq_execute_async(curs, query, no_result, no_begin); return _pq_execute_async(curs, query, no_result);
} }
} }