Improve pg_dump template1 error message.

bmomjian · bmomjian · commit 944dec1ff001 · 1999-10-10T14:42:44.000Z
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
@@ -21,7 +21,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.120 1999/09/23 19:11:09 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.121 1999/10/10 14:42:44 momjian Exp $
  *
  * Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb
  *
@@ -3070,14 +3070,16 @@ findLastBuiltinOid(void)
 	if (res == NULL ||
 		PQresultStatus(res) != PGRES_TUPLES_OK)
 	{
-		fprintf(stderr, "pg_dump error in finding the template1 database.  Explanation from backend: '%s'.\n", PQerrorMessage(g_conn));
+		fprintf(stderr,"pg_dump error in finding the template1 database.");
+		fprintf(stderr,"Explanation from backend: '%s'.\n", PQerrorMessage(g_conn));
 		exit_nicely(g_conn);
 	}
 	ntups = PQntuples(res);
 	if (ntups != 1)
 	{
-		fprintf(stderr, "pg_dump: couldn't find the template1 database.  "
-				"You are really hosed.\nGiving up.\n");
+		fprintf(stderr,"pg_dump: couldn't find the template1 database.\n");
+		fprintf(stderr,"Check the table pg_database for a problem.\n");
+		fprintf(stderr,"There should be exactly one 'template1' entry\n");
 		exit_nicely(g_conn);
 	}
 	last_oid = atoi(PQgetvalue(res, 0, PQfnumber(res, "oid")));

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`*`
`22`	`22`	`*`
`23`	`23`	`* IDENTIFICATION`
`24`		`- * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.120 1999/09/23 19:11:09 momjian Exp $`
	`24`	`+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.121 1999/10/10 14:42:44 momjian Exp $`
`25`	`25`	`*`
`26`	`26`	`* Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb`
`27`	`27`	`*`
`@@ -3070,14 +3070,16 @@ findLastBuiltinOid(void)`
`3070`	`3070`	`if (res == NULL \|\|`
`3071`	`3071`	`PQresultStatus(res) != PGRES_TUPLES_OK)`
`3072`	`3072`	`{`
`3073`		`- fprintf(stderr, "pg_dump error in finding the template1 database. Explanation from backend: '%s'.\n", PQerrorMessage(g_conn));`
	`3073`	`+ fprintf(stderr,"pg_dump error in finding the template1 database.");`
	`3074`	`+ fprintf(stderr,"Explanation from backend: '%s'.\n", PQerrorMessage(g_conn));`
`3074`	`3075`	`exit_nicely(g_conn);`
`3075`	`3076`	`}`
`3076`	`3077`	`ntups = PQntuples(res);`
`3077`	`3078`	`if (ntups != 1)`
`3078`	`3079`	`{`
`3079`		`- fprintf(stderr, "pg_dump: couldn't find the template1 database. "`
`3080`		`- "You are really hosed.\nGiving up.\n");`
	`3080`	`+ fprintf(stderr,"pg_dump: couldn't find the template1 database.\n");`
	`3081`	`+ fprintf(stderr,"Check the table pg_database for a problem.\n");`
	`3082`	`+ fprintf(stderr,"There should be exactly one 'template1' entry\n");`
`3081`	`3083`	`exit_nicely(g_conn);`
`3082`	`3084`	`}`
`3083`	`3085`	`last_oid = atoi(PQgetvalue(res, 0, PQfnumber(res, "oid")));`