From 0845538f3aeeadbf32a04131222cb4bd447543f8 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sun, 28 Aug 2005 16:31:37 +0000
Subject: [PATCH] dumpUserConfig failed (in a pretty harmless way, but failed
 nonetheless) to cope with a group name when dumping from a pre-8.1
 installation. Per report from Stefan Kaltenbrunner.

---
 src/bin/pg_dump/pg_dumpall.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
index 28032c47b9..92ca0143b0 100644
--- a/src/bin/pg_dump/pg_dumpall.c
+++ b/src/bin/pg_dump/pg_dumpall.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.66 2005/07/31 17:19:19 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.67 2005/08/28 16:31:37 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -928,10 +928,10 @@ dumpUserConfig(PGconn *conn, const char *username)
 		else
 			printfPQExpBuffer(buf, "SELECT useconfig[%d] FROM pg_shadow WHERE usename = ", count);
 		appendStringLiteral(buf, username, true);
-		appendPQExpBuffer(buf, ";");
 
 		res = executeQuery(conn, buf->data);
-		if (!PQgetisnull(res, 0, 0))
+		if (PQntuples(res) == 1 &&
+			!PQgetisnull(res, 0, 0))
 		{
 			makeAlterConfigCommand(PQgetvalue(res, 0, 0), "ROLE", username);
 			PQclear(res);