psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2024-11-29 04:13:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Handle ok poll() without a cursor having executed queries

Browse Source 
Close #887
This commit is contained in:
Daniele Varrazzo 2019-04-05 18:04:55 +01:00
parent 34d45aea87
commit 755a128ffb
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
NEWS
View File

@ -1,6 +1,13 @@
Current release Current release
--------------- ---------------
What's new in psycopg 2.8.1
---------------------------
- Fixed "there's no async cursor" error polling a connection with no cursor
(:ticket:`#887`).
What's new in psycopg 2.8 What's new in psycopg 2.8
------------------------- -------------------------

8
psycopg/connection_int.c
View File

@ -1045,12 +1045,6 @@ static cursorObject *
_conn_get_async_cursor(connectionObject *self) { _conn_get_async_cursor(connectionObject *self) {
PyObject *py_curs; PyObject *py_curs;
if (!(self->async_cursor)) {
PyErr_SetString(PyExc_SystemError,
"unexpectedly, there's no async cursor here");
goto error;
}
if (!(py_curs = PyWeakref_GetObject(self->async_cursor))) { if (!(py_curs = PyWeakref_GetObject(self->async_cursor))) {
PyErr_SetString(PyExc_SystemError, PyErr_SetString(PyExc_SystemError,
"got null dereferencing cursor weakref"); "got null dereferencing cursor weakref");
@ -1108,7 +1102,7 @@ conn_poll(connectionObject *self)
Dprintf("conn_poll: status -> CONN_STATUS_*"); Dprintf("conn_poll: status -> CONN_STATUS_*");
res = _conn_poll_query(self); res = _conn_poll_query(self);
if (res == PSYCO_POLL_OK && self->async) { if (res == PSYCO_POLL_OK && self->async && self->async_cursor) {
cursorObject *curs; cursorObject *curs;
/* An async query has just finished: parse the tuple in the /* An async query has just finished: parse the tuple in the

4
tests/test_async.py
View File

@ -495,6 +495,10 @@ class AsyncTests(ConnectingTestCase):
self.assert_(polls >= 8, polls) self.assert_(polls >= 8, polls)
def test_poll_noop(self):
self.conn.poll()
self.conn.poll()
def test_suite(): def test_suite():
return unittest.TestLoader().loadTestsFromName(__name__) return unittest.TestLoader().loadTestsFromName(__name__)