diff options
| author | James Henstridge <james@jamesh.id.au> | 2008-01-10 18:14:44 +0000 |
|---|---|---|
| committer | James Henstridge <james@jamesh.id.au> | 2008-01-10 18:14:44 +0000 |
| commit | 729117af8ba7d60bb80b636db1866e521f2fd399 (patch) | |
| tree | c63aa95fc1aa8087375c30830a69778c7f1d29a2 /psycopg/pqpath.h | |
| parent | d190d5918aed4757a79b0799679fecdaa92a234d (diff) | |
| download | psycopg2-729117af8ba7d60bb80b636db1866e521f2fd399.tar.gz | |
* psycopg/connection_int.c (conn_close): fix for new
pq_abort_locked() prototype.
(conn_switch_isolation_level): fix for new pq_abort_locked()
prototype, and use pq_complete_error() to show error message.
(conn_set_client_encoding): same here.
* psycopg/pqpath.c (pq_execute_command_locked): remove static
modifier.
(pq_complete_error): same here.
(pq_abort_locked): add pgres and error arguments.
(pq_abort): call pq_abort_locked() to reduce code duplication.
Diffstat (limited to 'psycopg/pqpath.h')
| -rw-r--r-- | psycopg/pqpath.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/psycopg/pqpath.h b/psycopg/pqpath.h index d55b0b6..e3cee11 100644 --- a/psycopg/pqpath.h +++ b/psycopg/pqpath.h @@ -33,10 +33,18 @@ extern int pq_fetch(cursorObject *curs); extern int pq_execute(cursorObject *curs, const char *query, int async); extern int pq_commit(connectionObject *conn); -extern int pq_abort_locked(connectionObject *conn); +extern int pq_abort_locked(connectionObject *conn, PGresult **pgres, + char **error); extern int pq_abort(connectionObject *conn); extern int pq_is_busy(connectionObject *conn); + extern void pq_set_critical(connectionObject *conn, const char *msg); extern PyObject *pq_resolve_critical(connectionObject *conn, int close); +extern int pq_execute_command_locked(connectionObject *conn, + const char *query, + PGresult **pgres, char **error); +extern void pq_complete_error(connectionObject *conn, PGresult **pgres, + char **error); + #endif /* !defined(PSYCOPG_PQPATH_H) */ |