psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2024-12-02 13:43:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use the wait callback in the connection setup queries.

Browse Source
This commit is contained in:
Daniele Varrazzo 2010-04-05 02:16:58 +01:00
parent 0ec73a18b4
commit 4bb0c3bdf6
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
psycopg/connection_int.c
View File

@ -256,9 +256,13 @@ conn_setup(connectionObject *self, PGconn *pgconn)
self->equote = conn_get_standard_conforming_strings(pgconn); self->equote = conn_get_standard_conforming_strings(pgconn);
if (!psyco_green()) {
Py_UNBLOCK_THREADS; Py_UNBLOCK_THREADS;
pgres = PQexec(pgconn, psyco_datestyle); pgres = PQexec(pgconn, psyco_datestyle);
Py_BLOCK_THREADS; Py_BLOCK_THREADS;
} else {
pgres = psyco_exec_green(self, psyco_datestyle);
}
if (pgres == NULL || PQresultStatus(pgres) != PGRES_COMMAND_OK ) { if (pgres == NULL || PQresultStatus(pgres) != PGRES_COMMAND_OK ) {
PyErr_SetString(OperationalError, "can't set datestyle to ISO"); PyErr_SetString(OperationalError, "can't set datestyle to ISO");
@ -270,9 +274,13 @@ conn_setup(connectionObject *self, PGconn *pgconn)
} }
CLEARPGRES(pgres); CLEARPGRES(pgres);
if (!psyco_green()) {
Py_UNBLOCK_THREADS; Py_UNBLOCK_THREADS;
pgres = PQexec(pgconn, psyco_client_encoding); pgres = PQexec(pgconn, psyco_client_encoding);
Py_BLOCK_THREADS; Py_BLOCK_THREADS;
} else {
pgres = psyco_exec_green(self, psyco_client_encoding);
}
if (pgres == NULL || PQresultStatus(pgres) != PGRES_TUPLES_OK) { if (pgres == NULL || PQresultStatus(pgres) != PGRES_TUPLES_OK) {
PyErr_SetString(OperationalError, "can't fetch client_encoding"); PyErr_SetString(OperationalError, "can't fetch client_encoding");
@ -292,9 +300,13 @@ conn_setup(connectionObject *self, PGconn *pgconn)
return -1; return -1;
} }
if (!psyco_green()) {
Py_UNBLOCK_THREADS; Py_UNBLOCK_THREADS;
pgres = PQexec(pgconn, psyco_transaction_isolation); pgres = PQexec(pgconn, psyco_transaction_isolation);
Py_BLOCK_THREADS; Py_BLOCK_THREADS;
} else {
pgres = psyco_exec_green(self, psyco_transaction_isolation);
}
if (pgres == NULL || PQresultStatus(pgres) != PGRES_TUPLES_OK) { if (pgres == NULL || PQresultStatus(pgres) != PGRES_TUPLES_OK) {
PyErr_SetString(OperationalError, PyErr_SetString(OperationalError,
@ -379,11 +391,11 @@ conn_sync_connect(connectionObject *self)
*/ */
self->status = CONN_STATUS_READY; self->status = CONN_STATUS_READY;
if (conn_setup(self, self->pgconn) == -1) { if (pq_set_non_blocking(self, 1, 1) != 0) {
return -1; return -1;
} }
if (pq_set_non_blocking(self, 1, 1) != 0) { if (conn_setup(self, self->pgconn) == -1) {
return -1; return -1;
} }