From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Mon, 4 Aug 2003 19:10:40 +0000 (+0000)
Subject: Must print server's failure message before trying reconnect, not after.
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=d373f30a8bae41572ddb41068fca7932239fb68b;p=users%2Fbernd%2Fpostgres.git

Must print server's failure message before trying reconnect, not after.
---

diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c
index af1e8bc20b..17c4dff6fc 100644
--- a/src/bin/psql/common.c
+++ b/src/bin/psql/common.c
@@ -247,7 +247,7 @@ ConnectionUp()
  * with a code of EXIT_BADCONN.
  */
 static bool
-CheckConnection()
+CheckConnection(void)
 {
 	bool		OK;
 
@@ -344,8 +344,8 @@ AcceptResult(const PGresult *result)
 
 	if (!OK)
 	{
-		CheckConnection();
 		psql_error("%s", PQerrorMessage(pset.db));
+		CheckConnection();
 	}
 
 	return OK;
@@ -514,7 +514,8 @@ PrintQueryResults(PGresult *results,
 					if (pset.popt.topt.format == PRINT_HTML)
 					{
 						fputs("<p>", pset.queryFout);
-						html_escaped_print(PQcmdStatus(results), pset.queryFout);
+						html_escaped_print(PQcmdStatus(results),
+										   pset.queryFout);
 						fputs("</p>\n", pset.queryFout);
 					}
 					else
@@ -542,6 +543,7 @@ PrintQueryResults(PGresult *results,
 
 	fflush(pset.queryFout);
 
+	/* may need this to recover from conn loss during COPY */
 	if (!CheckConnection())
 		return false;