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

diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml
index 4691abb78d616f39386ba04dd24ea241410a2208..97a6ab5e7124d1db9c5a8c94a6a8e31c987edc4a 100644 (file)
--- a/doc/src/sgml/libpq.sgml
+++ b/doc/src/sgml/libpq.sgml
@@ -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">
@@ -3979,8 +3979,8 @@ main(int argc, char **argv)
         /* Check to see that the backend connection was successfully made */
         if (PQstatus(conn) != CONNECTION_OK)
         {
-                fprintf(stderr, "Connection to database '%s' failed.\n", PQdb(conn));
-                fprintf(stderr, "%s", PQerrorMessage(conn));
+                fprintf(stderr, "Connection to database failed: %s",
+                        PQerrorMessage(conn));
                 exit_nicely(conn);
         }
 
@@ -4125,8 +4125,8 @@ main(int argc, char **argv)
         /* Check to see that the backend connection was successfully made */
         if (PQstatus(conn) != CONNECTION_OK)
         {
-                fprintf(stderr, "Connection to database '%s' failed.\n", PQdb(conn));
-                fprintf(stderr, "%s", PQerrorMessage(conn));
+                fprintf(stderr, "Connection to database failed: %s",
+                        PQerrorMessage(conn));
                 exit_nicely(conn);
         }
 
@@ -4267,8 +4267,8 @@ main(int argc, char **argv)
         /* Check to see that the backend connection was successfully made */
         if (PQstatus(conn) != CONNECTION_OK)
         {
-                fprintf(stderr, "Connection to database '%s' failed.\n", PQdb(conn));
-                fprintf(stderr, "%s", PQerrorMessage(conn));
+                fprintf(stderr, "Connection to database failed: %s",
+                        PQerrorMessage(conn));
                 exit_nicely(conn);
         }
 

diff --git a/src/test/examples/testlibpq.c b/src/test/examples/testlibpq.c
index f650118a29e8efc5d080d947018a8ba83e48d533..b9d396a2dcb2eaee6f73aaaaed77a7db2bf693d0 100644 (file)
--- a/src/test/examples/testlibpq.c
+++ b/src/test/examples/testlibpq.c
@@ -41,8 +41,8 @@ main(int argc, char **argv)
    /* Check to see that the backend connection was successfully made */
    if (PQstatus(conn) != CONNECTION_OK)
    {
-       fprintf(stderr, "Connection to database '%s' failed.\n", PQdb(conn));
-       fprintf(stderr, "%s", PQerrorMessage(conn));
+       fprintf(stderr, "Connection to database failed: %s",
+               PQerrorMessage(conn));
        exit_nicely(conn);
    }
 

diff --git a/src/test/examples/testlibpq2.c b/src/test/examples/testlibpq2.c
index 928ffbb5b48e29c31020829069a3dbc8bedb0206..1cb7616f24ba5e16997c3799fa6ab344e07e4287 100644 (file)
--- a/src/test/examples/testlibpq2.c
+++ b/src/test/examples/testlibpq2.c
@@ -61,8 +61,8 @@ main(int argc, char **argv)
    /* Check to see that the backend connection was successfully made */
    if (PQstatus(conn) != CONNECTION_OK)
    {
-       fprintf(stderr, "Connection to database '%s' failed.\n", PQdb(conn));
-       fprintf(stderr, "%s", PQerrorMessage(conn));
+       fprintf(stderr, "Connection to database failed: %s",
+               PQerrorMessage(conn));
        exit_nicely(conn);
    }
 

diff --git a/src/test/examples/testlibpq3.c b/src/test/examples/testlibpq3.c
index 43c1068a457a7dc0d26e97a29b39cfa997bc59b2..7036d3e81fbf642a29580940e177ac549f42ccea 100644 (file)
--- a/src/test/examples/testlibpq3.c
+++ b/src/test/examples/testlibpq3.c
@@ -66,8 +66,8 @@ main(int argc, char **argv)
    /* Check to see that the backend connection was successfully made */
    if (PQstatus(conn) != CONNECTION_OK)
    {
-       fprintf(stderr, "Connection to database '%s' failed.\n", PQdb(conn));
-       fprintf(stderr, "%s", PQerrorMessage(conn));
+       fprintf(stderr, "Connection to database failed: %s",
+               PQerrorMessage(conn));
        exit_nicely(conn);
    }
 

diff --git a/src/test/examples/testlibpq4.c b/src/test/examples/testlibpq4.c
index 0eda55352ed29f8df37c6fcb22963352c5649171..977e4edd996ba03114683f2209372b287ce97f91 100644 (file)
--- a/src/test/examples/testlibpq4.c
+++ b/src/test/examples/testlibpq4.c
@@ -22,10 +22,10 @@ static void
 check_conn(PGconn *conn, const char *dbName)
 {
    /* 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, "%s", PQerrorMessage(conn));
+       fprintf(stderr, "Connection to database \"%s\" failed: %s",
+               dbName, PQerrorMessage(conn));
        exit(1);
    }
 }

diff --git a/src/test/examples/testlo.c b/src/test/examples/testlo.c
index 988b51171a905ab1c955a3e69cc48c3d0460cfdb..019829649acb37c96a9f32ffdcdb644846aadf03 100644 (file)
--- a/src/test/examples/testlo.c
+++ b/src/test/examples/testlo.c
@@ -8,7 +8,7 @@
  *
  *
  * 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);
 
    /* 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, "%s", PQerrorMessage(conn));
+       fprintf(stderr, "Connection to database failed: %s",
+               PQerrorMessage(conn));
        exit_nicely(conn);
    }