Provide the libpq error message when PQputline or PQendcopy fails.

tglsfdc · tglsfdc · commit ff2cc83f8a73 · 2006-02-09T18:28:29.000Z
diff --git 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.67 2006/02/05 20:58:47 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_db.c,v 1.68 2006/02/09 18:28:29 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -389,7 +389,8 @@ _sendCopyLine(ArchiveHandle *AH, char *qry, char *eos)
 	 * to continue after an error in a COPY command.
 	 */
 	if (AH->pgCopyIn && PQputline(AH->connection, AH->pgCopyBuf->data) != 0)
-		die_horribly(AH, modulename, "error returned by PQputline\n");
+		die_horribly(AH, modulename, "error returned by PQputline: %s",
+					 PQerrorMessage(AH->connection));
 
 	resetPQExpBuffer(AH->pgCopyBuf);
 
@@ -400,7 +401,8 @@ _sendCopyLine(ArchiveHandle *AH, char *qry, char *eos)
 	if (isEnd)
 	{
 		if (AH->pgCopyIn && PQendcopy(AH->connection) != 0)
-			die_horribly(AH, modulename, "error returned by PQendcopy\n");
+			die_horribly(AH, modulename, "error returned by PQendcopy: %s",
+						 PQerrorMessage(AH->connection));
 
 		AH->pgCopyIn = false;
 	}

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`* Implements the basic DB functions used by the archiver.`
`6`	`6`	`*`
`7`	`7`	`* IDENTIFICATION`
`8`		`- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_db.c,v 1.67 2006/02/05 20:58:47 tgl Exp $`
	`8`	`+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_db.c,v 1.68 2006/02/09 18:28:29 tgl Exp $`
`9`	`9`	`*`
`10`	`10`	`*-------------------------------------------------------------------------`
`11`	`11`	`*/`
`@@ -389,7 +389,8 @@ _sendCopyLine(ArchiveHandle AH, char qry, char *eos)`
`389`	`389`	`* to continue after an error in a COPY command.`
`390`	`390`	`*/`
`391`	`391`	`if (AH->pgCopyIn && PQputline(AH->connection, AH->pgCopyBuf->data) != 0)`
`392`		`- die_horribly(AH, modulename, "error returned by PQputline\n");`
	`392`	`+ die_horribly(AH, modulename, "error returned by PQputline: %s",`
	`393`	`+ PQerrorMessage(AH->connection));`
`393`	`394`
`394`	`395`	`resetPQExpBuffer(AH->pgCopyBuf);`
`395`	`396`
`@@ -400,7 +401,8 @@ _sendCopyLine(ArchiveHandle AH, char qry, char *eos)`
`400`	`401`	`if (isEnd)`
`401`	`402`	`{`
`402`	`403`	`if (AH->pgCopyIn && PQendcopy(AH->connection) != 0)`
`403`		`- die_horribly(AH, modulename, "error returned by PQendcopy\n");`
	`404`	`+ die_horribly(AH, modulename, "error returned by PQendcopy: %s",`
	`405`	`+ PQerrorMessage(AH->connection));`
`404`	`406`
`405`	`407`	`AH->pgCopyIn = false;`
`406`	`408`	`}`