psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2024-11-22 17:06:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup after pq_fetch static analysis

Browse Source 
The behaviour around _pq_fetch_tuples might have changed a little but it
seems behaving right and is more straightforward now.
This commit is contained in:
Daniele Varrazzo 2019-01-23 09:03:16 +00:00
parent 6dc1f9a3b0
commit d38ffc6cf1
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
psycopg/connection_int.c
View File

@ -1107,7 +1107,7 @@ conn_poll(connectionObject *self)
/* fetch the tuples (if there are any) and build the result. We /* fetch the tuples (if there are any) and build the result. We
* don't care if pq_fetch return 0 or 1, but if there was an error, * don't care if pq_fetch return 0 or 1, but if there was an error,
* we want to signal it to the caller. */ * we want to signal it to the caller. */
if (pq_fetch(curs, 0) == -1) { if (0 > pq_fetch(curs, 0)) {
res = PSYCO_POLL_ERROR; res = PSYCO_POLL_ERROR;
} }

11
psycopg/pqpath.c
View File

@ -246,7 +246,7 @@ pq_resolve_critical(connectionObject *conn, int close)
PyErr_SetString(OperationalError, msg); PyErr_SetString(OperationalError, msg);
/* we don't want to destroy this connection but just close it */ /* we don't want to destroy this connection but just close it */
if (close == 1) conn_close(conn); if (close) conn_close(conn);
/* remember to clear the critical! */ /* remember to clear the critical! */
pq_clear_critical(conn); pq_clear_critical(conn);
@ -1832,7 +1832,7 @@ exit:
return ret; return ret;
} }
int RAISES_NEG int
pq_fetch(cursorObject *curs, int no_result) pq_fetch(cursorObject *curs, int no_result)
{ {
int pgstatus, ex = -1; int pgstatus, ex = -1;
@ -1863,8 +1863,7 @@ pq_fetch(cursorObject *curs, int no_result)
Py_CLEAR(curs->pgstatus); Py_CLEAR(curs->pgstatus);
if (!(curs->pgstatus = TO_STATE(conn_text_from_chars( if (!(curs->pgstatus = TO_STATE(conn_text_from_chars(
curs->conn, PQcmdStatus(curs->pgres))))) { curs->conn, PQcmdStatus(curs->pgres))))) {
ex = -1; return -1;
return ex;
} }
switch(pgstatus) { switch(pgstatus) {
@ -1910,7 +1909,7 @@ pq_fetch(cursorObject *curs, int no_result)
if (!no_result) { if (!no_result) {
Dprintf("pq_fetch: got tuples"); Dprintf("pq_fetch: got tuples");
curs->rowcount = PQntuples(curs->pgres); curs->rowcount = PQntuples(curs->pgres);
if (0 == _pq_fetch_tuples(curs)) { ex = 0; } ex = _pq_fetch_tuples(curs);
/* don't clear curs->pgres, because it contains the results! */ /* don't clear curs->pgres, because it contains the results! */
} }
else { else {
@ -1956,7 +1955,7 @@ pq_fetch(cursorObject *curs, int no_result)
raise the exception but we avoid to close the connection) */ raise the exception but we avoid to close the connection) */
Dprintf("pq_fetch: fetching done; check for critical errors"); Dprintf("pq_fetch: fetching done; check for critical errors");
if (curs->conn->critical) { if (curs->conn->critical) {
return pq_resolve_critical(curs->conn, ex == -1 ? 1 : 0); ex = pq_resolve_critical(curs->conn, ex < 0);
} }
return ex; return ex;