|
Line
Link Here
|
| 0 |
-- psycopg/pqpath.c |
0 |
++ psycopg/pqpath.c |
|
Lines 344-354
pq_execute_command_locked(connectionObject *conn, const char *query,
Link Here
|
| 344 |
} |
344 |
} |
| 345 |
if (*pgres == NULL) { |
345 |
if (*pgres == NULL) { |
| 346 |
Dprintf("pq_execute_command_locked: PQexec returned NULL"); |
346 |
Dprintf("pq_execute_command_locked: PQexec returned NULL"); |
|
|
347 |
PyEval_RestoreThread(*tstate); |
| 347 |
if (!PyErr_Occurred()) { |
348 |
if (!PyErr_Occurred()) { |
| 348 |
const char *msg; |
349 |
const char *msg; |
| 349 |
msg = PQerrorMessage(conn->pgconn); |
350 |
msg = PQerrorMessage(conn->pgconn); |
| 350 |
if (msg && *msg) { *error = strdup(msg); } |
351 |
if (msg && *msg) { *error = strdup(msg); } |
| 351 |
} |
352 |
} |
|
|
353 |
*tstate = PyEval_SaveThread(); |
| 352 |
goto cleanup; |
354 |
goto cleanup; |
| 353 |
} |
355 |
} |
| 354 |
|
356 |
|
|
Lines 635-645
pq_get_guc_locked(
Link Here
|
| 635 |
|
637 |
|
| 636 |
if (*pgres == NULL) { |
638 |
if (*pgres == NULL) { |
| 637 |
Dprintf("pq_get_guc_locked: PQexec returned NULL"); |
639 |
Dprintf("pq_get_guc_locked: PQexec returned NULL"); |
|
|
640 |
PyEval_RestoreThread(*tstate); |
| 638 |
if (!PyErr_Occurred()) { |
641 |
if (!PyErr_Occurred()) { |
| 639 |
const char *msg; |
642 |
const char *msg; |
| 640 |
msg = PQerrorMessage(conn->pgconn); |
643 |
msg = PQerrorMessage(conn->pgconn); |
| 641 |
if (msg && *msg) { *error = strdup(msg); } |
644 |
if (msg && *msg) { *error = strdup(msg); } |
| 642 |
} |
645 |
} |
|
|
646 |
*tstate = PyEval_SaveThread(); |
| 643 |
goto cleanup; |
647 |
goto cleanup; |
| 644 |
} |
648 |
} |
| 645 |
if (PQresultStatus(*pgres) != PGRES_TUPLES_OK) { |
649 |
if (PQresultStatus(*pgres) != PGRES_TUPLES_OK) { |
| 646 |
- |
|
|
