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

tglsfdc · tglsfdc · commit 8bbfa16624e5 · 2004-10-01T17:34:19.000Z
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`<!--`
`2`		`-$PostgreSQL: pgsql/doc/src/sgml/libpq.sgml,v 1.164 2004/09/26 22:51:49 tgl Exp $`
	`2`	`+$PostgreSQL: pgsql/doc/src/sgml/libpq.sgml,v 1.165 2004/10/01 17:34:17 tgl Exp $`
`3`	`3`	`-->`
`4`	`4`
`5`	`5`	`<chapter id="libpq">`
`@@ -3979,8 +3979,8 @@ main(int argc, char **argv)`
`3979`	`3979`	`/* Check to see that the backend connection was successfully made */`
`3980`	`3980`	`if (PQstatus(conn) != CONNECTION_OK)`
`3981`	`3981`	`{`
`3982`		`- fprintf(stderr, "Connection to database '%s' failed.\n", PQdb(conn));`
`3983`		`- fprintf(stderr, "%s", PQerrorMessage(conn));`
	`3982`	`+ fprintf(stderr, "Connection to database failed: %s",`
	`3983`	`+ PQerrorMessage(conn));`
`3984`	`3984`	`exit_nicely(conn);`
`3985`	`3985`	`}`
`3986`	`3986`
`@@ -4125,8 +4125,8 @@ main(int argc, char **argv)`
`4125`	`4125`	`/* Check to see that the backend connection was successfully made */`
`4126`	`4126`	`if (PQstatus(conn) != CONNECTION_OK)`
`4127`	`4127`	`{`
`4128`		`- fprintf(stderr, "Connection to database '%s' failed.\n", PQdb(conn));`
`4129`		`- fprintf(stderr, "%s", PQerrorMessage(conn));`
	`4128`	`+ fprintf(stderr, "Connection to database failed: %s",`
	`4129`	`+ PQerrorMessage(conn));`
`4130`	`4130`	`exit_nicely(conn);`
`4131`	`4131`	`}`
`4132`	`4132`
`@@ -4267,8 +4267,8 @@ main(int argc, char **argv)`
`4267`	`4267`	`/* Check to see that the backend connection was successfully made */`
`4268`	`4268`	`if (PQstatus(conn) != CONNECTION_OK)`
`4269`	`4269`	`{`
`4270`		`- fprintf(stderr, "Connection to database '%s' failed.\n", PQdb(conn));`
`4271`		`- fprintf(stderr, "%s", PQerrorMessage(conn));`
	`4270`	`+ fprintf(stderr, "Connection to database failed: %s",`
	`4271`	`+ PQerrorMessage(conn));`
`4272`	`4272`	`exit_nicely(conn);`
`4273`	`4273`	`}`
`4274`	`4274`
Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,8 @@ main(int argc, char **argv)`
`41`	`41`	`/* Check to see that the backend connection was successfully made */`
`42`	`42`	`if (PQstatus(conn) != CONNECTION_OK)`
`43`	`43`	`{`
`44`		`- fprintf(stderr, "Connection to database '%s' failed.\n", PQdb(conn));`
`45`		`- fprintf(stderr, "%s", PQerrorMessage(conn));`
	`44`	`+ fprintf(stderr, "Connection to database failed: %s",`
	`45`	`+ PQerrorMessage(conn));`
`46`	`46`	`exit_nicely(conn);`
`47`	`47`	`}`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -61,8 +61,8 @@ main(int argc, char **argv)`
`61`	`61`	`/* Check to see that the backend connection was successfully made */`
`62`	`62`	`if (PQstatus(conn) != CONNECTION_OK)`
`63`	`63`	`{`
`64`		`- fprintf(stderr, "Connection to database '%s' failed.\n", PQdb(conn));`
`65`		`- fprintf(stderr, "%s", PQerrorMessage(conn));`
	`64`	`+ fprintf(stderr, "Connection to database failed: %s",`
	`65`	`+ PQerrorMessage(conn));`
`66`	`66`	`exit_nicely(conn);`
`67`	`67`	`}`
`68`	`68`
Original file line number	Diff line number	Diff line change
`@@ -66,8 +66,8 @@ main(int argc, char **argv)`
`66`	`66`	`/* Check to see that the backend connection was successfully made */`
`67`	`67`	`if (PQstatus(conn) != CONNECTION_OK)`
`68`	`68`	`{`
`69`		`- fprintf(stderr, "Connection to database '%s' failed.\n", PQdb(conn));`
`70`		`- fprintf(stderr, "%s", PQerrorMessage(conn));`
	`69`	`+ fprintf(stderr, "Connection to database failed: %s",`
	`70`	`+ PQerrorMessage(conn));`
`71`	`71`	`exit_nicely(conn);`
`72`	`72`	`}`
`73`	`73`
Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,10 @@ static void`
`22`	`22`	`check_conn(PGconn conn, const char dbName)`
`23`	`23`	`{`
`24`	`24`	`/* check to see that the backend connection was successfully made */`
`25`		`- if (PQstatus(conn) == CONNECTION_BAD)`
	`25`	`+ if (PQstatus(conn) != CONNECTION_OK)`
`26`	`26`	`{`
`27`		`- fprintf(stderr, "Connection to database '%s' failed.\n", dbName);`
`28`		`- fprintf(stderr, "%s", PQerrorMessage(conn));`
	`27`	`+ fprintf(stderr, "Connection to database \"%s\" failed: %s",`
	`28`	`+ dbName, PQerrorMessage(conn));`
`29`	`29`	`exit(1);`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/test/examples/testlo.c,v 1.23 2004/09/22 05:12:45 neilc Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/test/examples/testlo.c,v 1.24 2004/10/01 17:34:19 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -225,10 +225,10 @@ main(int argc, char **argv)`
`225`	`225`	`conn = PQsetdb(NULL, NULL, NULL, NULL, database);`
`226`	`226`
`227`	`227`	`/* check to see that the backend connection was successfully made */`
`228`		`- if (PQstatus(conn) == CONNECTION_BAD)`
	`228`	`+ if (PQstatus(conn) != CONNECTION_OK)`
`229`	`229`	`{`
`230`		`- fprintf(stderr, "Connection to database '%s' failed.\n", database);`
`231`		`- fprintf(stderr, "%s", PQerrorMessage(conn));`
	`230`	`+ fprintf(stderr, "Connection to database failed: %s",`
	`231`	`+ PQerrorMessage(conn));`
`232`	`232`	`exit_nicely(conn);`
`233`	`233`	`}`
`234`	`234`