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

Merge branch 'master' into feature/replication-protocol

Browse Source
This commit is contained in:
Oleksandr Shulgin 2015-10-27 12:16:41 +01:00
commit 4b9a6f48f3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
psycopg/pqpath.c
View File

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