database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-08 22:02:03 +03:00
Code

Don't assume PQdb() will return a valid result from a failed connection.

Browse Source
This commit is contained in:
Tom Lane 2004-10-01 17:34:19 +00:00
parent bbd1e1cc68
commit 8bbfa16624
6 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
doc/src/sgml/libpq.sgml
View File

@ -1,5 +1,5 @@
<!-- <!--
$PostgreSQL: pgsql/doc/src/sgml/libpq.sgml,v 1.164 2004/09/26 22:51:49 tgl Exp $ $PostgreSQL: pgsql/doc/src/sgml/libpq.sgml,v 1.165 2004/10/01 17:34:17 tgl Exp $
--> -->
<chapter id="libpq"> <chapter id="libpq">
@ -3979,8 +3979,8 @@ main(int argc, char **argv)
/* Check to see that the backend connection was successfully made */ /* Check to see that the backend connection was successfully made */
if (PQstatus(conn) != CONNECTION_OK) if (PQstatus(conn) != CONNECTION_OK)
{ {
fprintf(stderr, "Connection to database '%s' failed.\n", PQdb(conn)); fprintf(stderr, "Connection to database failed: %s",
fprintf(stderr, "%s", PQerrorMessage(conn)); PQerrorMessage(conn));
exit_nicely(conn); exit_nicely(conn);
} }
@ -4125,8 +4125,8 @@ main(int argc, char **argv)
/* Check to see that the backend connection was successfully made */ /* Check to see that the backend connection was successfully made */
if (PQstatus(conn) != CONNECTION_OK) if (PQstatus(conn) != CONNECTION_OK)
{ {
fprintf(stderr, "Connection to database '%s' failed.\n", PQdb(conn)); fprintf(stderr, "Connection to database failed: %s",
fprintf(stderr, "%s", PQerrorMessage(conn)); PQerrorMessage(conn));
exit_nicely(conn); exit_nicely(conn);
} }
@ -4267,8 +4267,8 @@ main(int argc, char **argv)
/* Check to see that the backend connection was successfully made */ /* Check to see that the backend connection was successfully made */
if (PQstatus(conn) != CONNECTION_OK) if (PQstatus(conn) != CONNECTION_OK)
{ {
fprintf(stderr, "Connection to database '%s' failed.\n", PQdb(conn)); fprintf(stderr, "Connection to database failed: %s",
fprintf(stderr, "%s", PQerrorMessage(conn)); PQerrorMessage(conn));
exit_nicely(conn); exit_nicely(conn);
} }

4
src/test/examples/testlibpq.c
View File

@ -41,8 +41,8 @@ main(int argc, char **argv)
/* Check to see that the backend connection was successfully made */ /* Check to see that the backend connection was successfully made */
if (PQstatus(conn) != CONNECTION_OK) if (PQstatus(conn) != CONNECTION_OK)
{ {
fprintf(stderr, "Connection to database '%s' failed.\n", PQdb(conn)); fprintf(stderr, "Connection to database failed: %s",
fprintf(stderr, "%s", PQerrorMessage(conn)); PQerrorMessage(conn));
exit_nicely(conn); exit_nicely(conn);
} }

4
src/test/examples/testlibpq2.c
View File

@ -61,8 +61,8 @@ main(int argc, char **argv)
/* Check to see that the backend connection was successfully made */ /* Check to see that the backend connection was successfully made */
if (PQstatus(conn) != CONNECTION_OK) if (PQstatus(conn) != CONNECTION_OK)
{ {
fprintf(stderr, "Connection to database '%s' failed.\n", PQdb(conn)); fprintf(stderr, "Connection to database failed: %s",
fprintf(stderr, "%s", PQerrorMessage(conn)); PQerrorMessage(conn));
exit_nicely(conn); exit_nicely(conn);
} }

4
src/test/examples/testlibpq3.c
View File

@ -66,8 +66,8 @@ main(int argc, char **argv)
/* Check to see that the backend connection was successfully made */ /* Check to see that the backend connection was successfully made */
if (PQstatus(conn) != CONNECTION_OK) if (PQstatus(conn) != CONNECTION_OK)
{ {
fprintf(stderr, "Connection to database '%s' failed.\n", PQdb(conn)); fprintf(stderr, "Connection to database failed: %s",
fprintf(stderr, "%s", PQerrorMessage(conn)); PQerrorMessage(conn));
exit_nicely(conn); exit_nicely(conn);
} }

6
src/test/examples/testlibpq4.c
View File

@ -22,10 +22,10 @@ static void
check_conn(PGconn *conn, const char *dbName) check_conn(PGconn *conn, const char *dbName)
{ {
/* check to see that the backend connection was successfully made */ /* check to see that the backend connection was successfully made */
if (PQstatus(conn) == CONNECTION_BAD) if (PQstatus(conn) != CONNECTION_OK)
{ {
fprintf(stderr, "Connection to database '%s' failed.\n", dbName); fprintf(stderr, "Connection to database \"%s\" failed: %s",
fprintf(stderr, "%s", PQerrorMessage(conn)); dbName, PQerrorMessage(conn));
exit(1); exit(1);
} }
} }

8
src/test/examples/testlo.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/test/examples/testlo.c,v 1.23 2004/09/22 05:12:45 neilc Exp $ * $PostgreSQL: pgsql/src/test/examples/testlo.c,v 1.24 2004/10/01 17:34:19 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -225,10 +225,10 @@ main(int argc, char **argv)
conn = PQsetdb(NULL, NULL, NULL, NULL, database); conn = PQsetdb(NULL, NULL, NULL, NULL, database);
/* check to see that the backend connection was successfully made */ /* check to see that the backend connection was successfully made */
if (PQstatus(conn) == CONNECTION_BAD) if (PQstatus(conn) != CONNECTION_OK)
{ {
fprintf(stderr, "Connection to database '%s' failed.\n", database); fprintf(stderr, "Connection to database failed: %s",
fprintf(stderr, "%s", PQerrorMessage(conn)); PQerrorMessage(conn));
exit_nicely(conn); exit_nicely(conn);
} }