Improve pg_dump template1 error reports.

bmomjian · bmomjian · commit 65a2c8f5b829 · 1999-10-10T17:00:26.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.121 1999/10/10 14:42:44 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.122 1999/10/10 17:00:26 momjian Exp $
  *
  * Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb
  *
@@ -3075,11 +3075,16 @@ findLastBuiltinOid(void)
 		exit_nicely(g_conn);
 	}
 	ntups = PQntuples(res);
-	if (ntups != 1)
+	if (ntups < 1)
 	{
 		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");
+		fprintf(stderr,"There is no 'template1' entry in the 'pg_database' table.\n");
+		exit_nicely(g_conn);
+	}
+	if (ntups > 1)
+	{
+		fprintf(stderr,"pg_dump: found more than one template1 database.\n");
+		fprintf(stderr,"There is more than one 'template1' entry in the 'pg_database' table\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.121 1999/10/10 14:42:44 momjian Exp $`
	`24`	`+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.122 1999/10/10 17:00:26 momjian Exp $`
`25`	`25`	`*`
`26`	`26`	`* Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb`
`27`	`27`	`*`
`@@ -3075,11 +3075,16 @@ findLastBuiltinOid(void)`
`3075`	`3075`	`exit_nicely(g_conn);`
`3076`	`3076`	`}`
`3077`	`3077`	`ntups = PQntuples(res);`
`3078`		`- if (ntups != 1)`
	`3078`	`+ if (ntups < 1)`
`3079`	`3079`	`{`
`3080`	`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`	`+ fprintf(stderr,"There is no 'template1' entry in the 'pg_database' table.\n");`
	`3082`	`+ exit_nicely(g_conn);`
	`3083`	`+ }`
	`3084`	`+ if (ntups > 1)`
	`3085`	`+ {`
	`3086`	`+ fprintf(stderr,"pg_dump: found more than one template1 database.\n");`
	`3087`	`+ fprintf(stderr,"There is more than one 'template1' entry in the 'pg_database' table\n");`
`3083`	`3088`	`exit_nicely(g_conn);`
`3084`	`3089`	`}`
`3085`	`3090`	`last_oid = atoi(PQgetvalue(res, 0, PQfnumber(res, "oid")));`