Merge branch 'master' into feature/replication-protocol

This commit is contained in:
Oleksandr Shulgin 2015-10-27 12:16:41 +01:00
commit 4b9a6f48f3

View File

@ -1900,7 +1900,7 @@ pq_fetch(cursorObject *curs, int no_result)
case PGRES_NONFATAL_ERROR:
case PGRES_FATAL_ERROR:
Dprintf("pq_fetch: uh-oh, something FAILED: status = %d pgconn = %p",
status, curs->conn);
pgstatus, curs->conn);
pq_raise(curs->conn, curs, NULL);
ex = -1;
break;
@ -1908,7 +1908,7 @@ pq_fetch(cursorObject *curs, int no_result)
default:
/* PGRES_COPY_BOTH, PGRES_SINGLE_TUPLE, future statuses */
Dprintf("pq_fetch: got unsupported result: status = %d pgconn = %p",
status, curs->conn);
pgstatus, curs->conn);
PyErr_Format(NotSupportedError,
"got server response with unsupported status %s",
PQresStatus(curs->pgres == NULL ?