Also print the libpq error message when lo_create or lo_open fails

petere · petere · commit 2827516394ef · 2010-03-18T20:00:51.000Z
diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
@@ -15,7 +15,7 @@
  *
  *
  * IDENTIFICATION
- *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.182 2010/02/26 02:01:16 momjian Exp $
+ *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.183 2010/03/18 20:00:51 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -935,13 +935,13 @@ StartRestoreBlob(ArchiveHandle *AH, Oid oid, bool drop)
 		{
 			loOid = lo_create(AH->connection, oid);
 			if (loOid == 0 || loOid != oid)
-				die_horribly(AH, modulename, "could not create large object %u\n",
-							 oid);
+				die_horribly(AH, modulename, "could not create large object %u: %s",
+							 oid, PQerrorMessage(AH->connection));
 		}
 		AH->loFd = lo_open(AH->connection, oid, INV_WRITE);
 		if (AH->loFd == -1)
-			die_horribly(AH, modulename, "could not open large object %u\n",
-						 oid);
+			die_horribly(AH, modulename, "could not open large object %u: %s",
+						 oid, PQerrorMessage(AH->connection));
 	}
 	else
 	{
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
@@ -25,7 +25,7 @@
  *	http://archives.postgresql.org/pgsql-bugs/2010-02/msg00187.php
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.578 2010/03/11 04:36:43 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.579 2010/03/18 20:00:51 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2117,7 +2117,7 @@ dumpBlobs(Archive *AH, void *arg)
 			loFd = lo_open(g_conn, blobOid, INV_READ);
 			if (loFd == -1)
 			{
-				write_msg(NULL, "dumpBlobs(): could not open large object %u: %s",
+				write_msg(NULL, "could not open large object %u: %s",
 						  blobOid, PQerrorMessage(g_conn));
 				exit_nicely();
 			}
@@ -2130,7 +2130,7 @@ dumpBlobs(Archive *AH, void *arg)
 				cnt = lo_read(g_conn, loFd, buf, LOBBUFSIZE);
 				if (cnt < 0)
 				{
-					write_msg(NULL, "dumpBlobs(): error reading large object %u: %s",
+					write_msg(NULL, "error reading large object %u: %s",
 							  blobOid, PQerrorMessage(g_conn));
 					exit_nicely();
 				}

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`*`
`16`	`16`	`*`
`17`	`17`	`* IDENTIFICATION`
`18`		`- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.182 2010/02/26 02:01:16 momjian Exp $`
	`18`	`+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.183 2010/03/18 20:00:51 petere Exp $`
`19`	`19`	`*`
`20`	`20`	`*-------------------------------------------------------------------------`
`21`	`21`	`*/`
`@@ -935,13 +935,13 @@ StartRestoreBlob(ArchiveHandle *AH, Oid oid, bool drop)`
`935`	`935`	`{`
`936`	`936`	`loOid = lo_create(AH->connection, oid);`
`937`	`937`	`if (loOid == 0 \|\| loOid != oid)`
`938`		`- die_horribly(AH, modulename, "could not create large object %u\n",`
`939`		`- oid);`
	`938`	`+ die_horribly(AH, modulename, "could not create large object %u: %s",`
	`939`	`+ oid, PQerrorMessage(AH->connection));`
`940`	`940`	`}`
`941`	`941`	`AH->loFd = lo_open(AH->connection, oid, INV_WRITE);`
`942`	`942`	`if (AH->loFd == -1)`
`943`		`- die_horribly(AH, modulename, "could not open large object %u\n",`
`944`		`- oid);`
	`943`	`+ die_horribly(AH, modulename, "could not open large object %u: %s",`
	`944`	`+ oid, PQerrorMessage(AH->connection));`
`945`	`945`	`}`
`946`	`946`	`else`
`947`	`947`	`{`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`* http://archives.postgresql.org/pgsql-bugs/2010-02/msg00187.php`
`26`	`26`	`*`
`27`	`27`	`* IDENTIFICATION`
`28`		`- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.578 2010/03/11 04:36:43 tgl Exp $`
	`28`	`+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.579 2010/03/18 20:00:51 petere Exp $`
`29`	`29`	`*`
`30`	`30`	`*-------------------------------------------------------------------------`
`31`	`31`	`*/`
`@@ -2117,7 +2117,7 @@ dumpBlobs(Archive AH, void arg)`
`2117`	`2117`	`loFd = lo_open(g_conn, blobOid, INV_READ);`
`2118`	`2118`	`if (loFd == -1)`
`2119`	`2119`	`{`
`2120`		`- write_msg(NULL, "dumpBlobs(): could not open large object %u: %s",`
	`2120`	`+ write_msg(NULL, "could not open large object %u: %s",`
`2121`	`2121`	`blobOid, PQerrorMessage(g_conn));`
`2122`	`2122`	`exit_nicely();`
`2123`	`2123`	`}`
`@@ -2130,7 +2130,7 @@ dumpBlobs(Archive AH, void arg)`
`2130`	`2130`	`cnt = lo_read(g_conn, loFd, buf, LOBBUFSIZE);`
`2131`	`2131`	`if (cnt < 0)`
`2132`	`2132`	`{`
`2133`		`- write_msg(NULL, "dumpBlobs(): error reading large object %u: %s",`
	`2133`	`+ write_msg(NULL, "error reading large object %u: %s",`
`2134`	`2134`	`blobOid, PQerrorMessage(g_conn));`
`2135`	`2135`	`exit_nicely();`
`2136`	`2136`	`}`