mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-01-24 18:55:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix libpq startup code to work correctly in autocommit off mode.

Browse Source 
In passing, fix breakage for case where PGCLIENTENCODING is set in
environment.
This commit is contained in:
Tom Lane 2002-10-15 01:48:25 +00:00
parent 9ff695c944
commit e258a2b436
1 changed files with 56 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/interfaces/libpq/fe-connect.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.209 2002/10/14 17:15:11 momjian Exp $ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.210 2002/10/15 01:48:25 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1583,8 +1583,6 @@ PQsetenvPoll(PGconn *conn)
{ {
PGresult *res; PGresult *res;
static const char envname[] = "PGCLIENTENCODING";
if (conn == NULL || conn->status == CONNECTION_BAD) if (conn == NULL || conn->status == CONNECTION_BAD)
return PGRES_POLLING_FAILED; return PGRES_POLLING_FAILED;
@ -1625,25 +1623,23 @@ PQsetenvPoll(PGconn *conn)
goto error_return; goto error_return;
} }
/* We will loop here until there is nothing left to do in this call. */
keep_going: /* We will come back to here until there for (;;)
* is nothing left to parse. */ {
switch (conn->setenv_state) switch (conn->setenv_state)
{ {
case SETENV_STATE_ENCODINGS_SEND: case SETENV_STATE_ENCODINGS_SEND:
{ {
const char *env; const char *env = getenv("PGCLIENTENCODING");
env = getenv(envname);
if (!env || *env == '\0') if (!env || *env == '\0')
{ {
/* /*
* query server encoding if PGCLIENTENCODING is not * PGCLIENTENCODING is not specified, so query server
* specified * for it. We must use begin/commit in case autocommit
* is off by default.
*/ */
if (!PQsendQuery(conn, if (!PQsendQuery(conn, "begin; select getdatabaseencoding(); commit"))
"select getdatabaseencoding()"))
goto error_return; goto error_return;
conn->setenv_state = SETENV_STATE_ENCODINGS_WAIT; conn->setenv_state = SETENV_STATE_ENCODINGS_WAIT;
@ -1662,8 +1658,11 @@ keep_going: /* We will come back to here until there
goto error_return; goto error_return;
} }
conn->client_encoding = encoding; conn->client_encoding = encoding;
}
/* Move on to setting the environment options */
conn->setenv_state = SETENV_STATE_OPTION_SEND;
}
break;
} }
case SETENV_STATE_ENCODINGS_WAIT: case SETENV_STATE_ENCODINGS_WAIT:
@ -1675,34 +1674,32 @@ keep_going: /* We will come back to here until there
if (res) if (res)
{ {
if (PQresultStatus(res) == PGRES_TUPLES_OK)
{
/* set client encoding in pg_conn struct */
char *encoding; char *encoding;
if (PQresultStatus(res) != PGRES_TUPLES_OK)
{
PQclear(res);
goto error_return;
}
/* set client encoding in pg_conn struct */
encoding = PQgetvalue(res, 0, 0); encoding = PQgetvalue(res, 0, 0);
if (!encoding) /* this should not happen */ if (!encoding) /* this should not happen */
conn->client_encoding = PG_SQL_ASCII; conn->client_encoding = PG_SQL_ASCII;
else else
conn->client_encoding = pg_char_to_encoding(encoding); conn->client_encoding = pg_char_to_encoding(encoding);
PQclear(res);
/*
* We have to keep going in order to clear up the
* query
*/
goto keep_going;
} }
else if (PQresultStatus(res) != PGRES_COMMAND_OK)
{
PQclear(res);
goto error_return;
}
PQclear(res);
/* Keep reading until PQgetResult returns NULL */
}
else
{
/* NULL result indicates that the query is finished */ /* NULL result indicates that the query is finished */
/* Move on to setting the environment options */ /* Move on to setting the environment options */
conn->setenv_state = SETENV_STATE_OPTION_SEND; conn->setenv_state = SETENV_STATE_OPTION_SEND;
goto keep_going; }
break;
} }
case SETENV_STATE_OPTION_SEND: case SETENV_STATE_OPTION_SEND:
@ -1740,8 +1737,7 @@ keep_going: /* We will come back to here until there
/* No more options to send, so we are done. */ /* No more options to send, so we are done. */
conn->setenv_state = SETENV_STATE_IDLE; conn->setenv_state = SETENV_STATE_IDLE;
} }
break;
goto keep_going;
} }
case SETENV_STATE_OPTION_WAIT: case SETENV_STATE_OPTION_WAIT:
@ -1758,22 +1754,17 @@ keep_going: /* We will come back to here until there
PQclear(res); PQclear(res);
goto error_return; goto error_return;
} }
/* Don't need the result */
PQclear(res); PQclear(res);
/* Keep reading until PQgetResult returns NULL */
/*
* We have to keep going in order to clear up the
* query
*/
goto keep_going;
} }
else
{
/* NULL result indicates that the query is finished */ /* NULL result indicates that the query is finished */
/* Send the next option */ /* Send the next option */
conn->next_eo++; conn->next_eo++;
conn->setenv_state = SETENV_STATE_OPTION_SEND; conn->setenv_state = SETENV_STATE_OPTION_SEND;
goto keep_going; }
break;
} }
case SETENV_STATE_IDLE: case SETENV_STATE_IDLE:
@ -1786,6 +1777,7 @@ keep_going: /* We will come back to here until there
conn->setenv_state); conn->setenv_state);
goto error_return; goto error_return;
} }
}
/* Unreachable */ /* Unreachable */