postgres.git / summary / log / commit / refs

commit    7e9308544f041cf59e0dd4916fe93fee9aa91f99
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Sat Aug 16 02:25:23 2008 +0000
First released in: 8.4.0, 7.4.22, 8.0.18, 8.1.14, 8.2.10, 8.3.4

    Fix pg_dump/pg_restore's ExecuteSqlCommand() to behave suitably if PQexec
    returns NULL instead of a PGresult.  The former coding would fail, which
    is OK, but it neglected to give you the PQerrorMessage that might tell
    you why.  In the oldest branches, there was another problem: it'd sometimes
    report PQerrorMessage from the wrong connection.


 src/bin/pg_dump/pg_backup_db.c | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/bin/pg_dump/pg_backup_db.c b/src/bin/pg_dump/pg_backup_db.c
index 3cb29b0d346..8048c716be1 100644
--- a/src/bin/pg_dump/pg_backup_db.c
+++ b/src/bin/pg_dump/pg_backup_db.c
@@ -5,7 +5,7 @@
  *	Implements the basic DB functions used by the archiver.
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_db.c,v 1.66.2.2 2006/02/09 18:28:35 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_db.c,v 1.66.2.3 2008/08/16 02:25:23 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -293,19 +293,23 @@ ExecuteSqlCommand(ArchiveHandle *AH, PQExpBuffer qry, char *desc)
 	PGresult   *res;
 	char		errStmt[DB_MAX_ERR_STMT];
 
-	/* fprintf(stderr, "Executing: '%s'\n\n", qry->data); */
+#ifdef NOT_USED
+	 fprintf(stderr, "Executing: '%s'\n\n", qry->data);
+#endif
 	res = PQexec(conn, qry->data);
-	if (!res)
-		die_horribly(AH, modulename, "%s: no result from server\n", desc);
 
-	if (PQresultStatus(res) != PGRES_COMMAND_OK && PQresultStatus(res) != PGRES_TUPLES_OK)
+	switch (PQresultStatus(res))
 	{
-		if (PQresultStatus(res) == PGRES_COPY_IN)
-		{
+		case PGRES_COMMAND_OK:
+		case PGRES_TUPLES_OK:
+			/* A-OK */
+			break;
+		case PGRES_COPY_IN:
+			/* Assume this is an expected result */
 			AH->pgCopyIn = true;
-		}
-		else
-		{
+			break;
+		default:
+			/* trouble */
 			strncpy(errStmt, qry->data, DB_MAX_ERR_STMT);
 			if (errStmt[DB_MAX_ERR_STMT - 1] != '\0')
 			{
@@ -315,9 +319,7 @@ ExecuteSqlCommand(ArchiveHandle *AH, PQExpBuffer qry, char *desc)
 				errStmt[DB_MAX_ERR_STMT - 1] = '\0';
 			}
 			warn_or_die_horribly(AH, modulename, "%s: %s    Command was: %s\n",
-								 desc, PQerrorMessage(AH->connection),
-								 errStmt);
-		}
+								 desc, PQerrorMessage(conn), errStmt);
 	}
 
 	PQclear(res);


[parent: 7a9b6cd47259]