diff options
Diffstat (limited to 'psycopg/connection_int.c')
-rw-r--r-- | psycopg/connection_int.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/psycopg/connection_int.c b/psycopg/connection_int.c index cdc6f02..8d3b06a 100644 --- a/psycopg/connection_int.c +++ b/psycopg/connection_int.c @@ -705,7 +705,7 @@ exit: /* conn_connect - execute a connection to the database */ static int -_conn_sync_connect(connectionObject *self) +_conn_sync_connect(connectionObject *self, const char *dsn) { int green; @@ -714,26 +714,26 @@ _conn_sync_connect(connectionObject *self) green = psyco_green(); if (!green) { Py_BEGIN_ALLOW_THREADS; - self->pgconn = PQconnectdb(self->dsn); + self->pgconn = PQconnectdb(dsn); Py_END_ALLOW_THREADS; Dprintf("conn_connect: new PG connection at %p", self->pgconn); } else { Py_BEGIN_ALLOW_THREADS; - self->pgconn = PQconnectStart(self->dsn); + self->pgconn = PQconnectStart(dsn); Py_END_ALLOW_THREADS; Dprintf("conn_connect: new green PG connection at %p", self->pgconn); } if (!self->pgconn) { - Dprintf("conn_connect: PQconnectdb(%s) FAILED", self->dsn); + Dprintf("conn_connect: PQconnectdb(%s) FAILED", dsn); PyErr_SetString(OperationalError, "PQconnectdb() failed"); return -1; } else if (PQstatus(self->pgconn) == CONNECTION_BAD) { - Dprintf("conn_connect: PQconnectdb(%s) returned BAD", self->dsn); + Dprintf("conn_connect: PQconnectdb(%s) returned BAD", dsn); PyErr_SetString(OperationalError, PQerrorMessage(self->pgconn)); return -1; } @@ -763,23 +763,23 @@ _conn_sync_connect(connectionObject *self) } static int -_conn_async_connect(connectionObject *self) +_conn_async_connect(connectionObject *self, const char *dsn) { PGconn *pgconn; - self->pgconn = pgconn = PQconnectStart(self->dsn); + self->pgconn = pgconn = PQconnectStart(dsn); Dprintf("conn_connect: new postgresql connection at %p", pgconn); if (pgconn == NULL) { - Dprintf("conn_connect: PQconnectStart(%s) FAILED", self->dsn); + Dprintf("conn_connect: PQconnectStart(%s) FAILED", dsn); PyErr_SetString(OperationalError, "PQconnectStart() failed"); return -1; } else if (PQstatus(pgconn) == CONNECTION_BAD) { - Dprintf("conn_connect: PQconnectdb(%s) returned BAD", self->dsn); + Dprintf("conn_connect: PQconnectdb(%s) returned BAD", dsn); PyErr_SetString(OperationalError, PQerrorMessage(pgconn)); return -1; } @@ -800,17 +800,17 @@ _conn_async_connect(connectionObject *self) } int -conn_connect(connectionObject *self, long int async) +conn_connect(connectionObject *self, const char *dsn, long int async) { int rv; if (async == 1) { Dprintf("con_connect: connecting in ASYNC mode"); - rv = _conn_async_connect(self); + rv = _conn_async_connect(self, dsn); } else { Dprintf("con_connect: connecting in SYNC mode"); - rv = _conn_sync_connect(self); + rv = _conn_sync_connect(self, dsn); } if (rv != 0) { |