psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2025-02-12 07:10:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Close a connection if PQexec returned NULL

Browse Source 
This happens for Socket connections, not for TCP ones, where a result
containing an error is returned and correctly handled by pq_raise()

Closes ticket #196 but not #192: poll() still doesn't change the
connection closed.
This commit is contained in:
Daniele Varrazzo 2014-03-06 18:11:17 +00:00
parent f597c36f42
commit d1e1243ba8
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -10,6 +10,8 @@ What's new in psycopg 2.5.3
Adam Petrovich for the bug report and diagnosis. Adam Petrovich for the bug report and diagnosis.
- Don't segfault using poorly defined cursor subclasses which forgot to call - Don't segfault using poorly defined cursor subclasses which forgot to call
the superclass init (:ticket:`#195`). the superclass init (:ticket:`#195`).
- Mark the connection closed when a Socket connection is broken, as it
happens for TCP connections instead (:ticket:`#196`).
- It is now possible to call `get_transaction_status()` on closed connections. - It is now possible to call `get_transaction_status()` on closed connections.
- Fixed debug build on Windows, thanks to James Emerton. - Fixed debug build on Windows, thanks to James Emerton.

10
psycopg/pqpath.c
View File

@ -417,11 +417,19 @@ pq_complete_error(connectionObject *conn, PGresult **pgres, char **error)
pq_raise(conn, NULL, pgres); pq_raise(conn, NULL, pgres);
/* now *pgres is null */ /* now *pgres is null */
} }
else if (*error != NULL) { else {
if (*error != NULL) {
PyErr_SetString(OperationalError, *error); PyErr_SetString(OperationalError, *error);
} else { } else {
PyErr_SetString(OperationalError, "unknown error"); PyErr_SetString(OperationalError, "unknown error");
} }
/* Trivia: with a broken socket connection PQexec returns NULL, so we
* end up here. With a TCP connection we get a pgres with an error
* instead, and the connection gets closed in the pq_raise call above
* (see ticket #196)
*/
conn->closed = 2;
}
if (*error) { if (*error) {
free(*error); free(*error);