For create/dropdb, only connect once to the server since we now have a

bmomjian · bmomjian · commit 7ff771191928 · 2011-05-10T19:44:47.000-04:00
shared description table for pg_database comments.

Also update comments about database name selection.
diff --git a/src/bin/scripts/createdb.c b/src/bin/scripts/createdb.c
@@ -192,6 +192,11 @@ main(int argc, char *argv[])
 
 	appendPQExpBuffer(&sql, ";\n");
 
+    /*
+     * Connect to the 'postgres' database by default, except have
+     * the 'postgres' user use 'template1' so he can create the
+     * 'postgres' database.
+     */
 	conn = connectDatabase(strcmp(dbname, "postgres") == 0 ? "template1" : "postgres",
 						   host, port, username, prompt_password, progname);
 
@@ -208,12 +213,9 @@ main(int argc, char *argv[])
 	}
 
 	PQclear(result);
-	PQfinish(conn);
 
 	if (comment)
 	{
-		conn = connectDatabase(dbname, host, port, username, prompt_password, progname);
-
 		printfPQExpBuffer(&sql, "COMMENT ON DATABASE %s IS ", fmtId(dbname));
 		appendStringLiteralConn(&sql, comment, conn);
 		appendPQExpBuffer(&sql, ";\n");
@@ -231,9 +233,10 @@ main(int argc, char *argv[])
 		}
 
 		PQclear(result);
-		PQfinish(conn);
 	}
 
+	PQfinish(conn);
+
 	exit(0);
 }
 
diff --git a/src/bin/scripts/dropdb.c b/src/bin/scripts/dropdb.c
@@ -113,6 +113,11 @@ main(int argc, char *argv[])
 	appendPQExpBuffer(&sql, "DROP DATABASE %s;\n",
 					  fmtId(dbname));
 
+    /*
+     * Connect to the 'postgres' database by default, except have
+     * the 'postgres' user use 'template1' so he can drop the
+     * 'postgres' database.
+     */
 	conn = connectDatabase(strcmp(dbname, "postgres") == 0 ? "template1" : "postgres",
 						   host, port, username, prompt_password, progname);
 

Original file line number	Diff line number	Diff line change
`@@ -192,6 +192,11 @@ main(int argc, char *argv[])`
`192`	`192`
`193`	`193`	`appendPQExpBuffer(&sql, ";\n");`
`194`	`194`
	`195`	`+ /*`
	`196`	`+ * Connect to the 'postgres' database by default, except have`
	`197`	`+ * the 'postgres' user use 'template1' so he can create the`
	`198`	`+ * 'postgres' database.`
	`199`	`+ */`
`195`	`200`	`conn = connectDatabase(strcmp(dbname, "postgres") == 0 ? "template1" : "postgres",`
`196`	`201`	`host, port, username, prompt_password, progname);`
`197`	`202`
`@@ -208,12 +213,9 @@ main(int argc, char *argv[])`
`208`	`213`	`}`
`209`	`214`
`210`	`215`	`PQclear(result);`
`211`		`- PQfinish(conn);`
`212`	`216`
`213`	`217`	`if (comment)`
`214`	`218`	`{`
`215`		`- conn = connectDatabase(dbname, host, port, username, prompt_password, progname);`
`216`		`-`
`217`	`219`	`printfPQExpBuffer(&sql, "COMMENT ON DATABASE %s IS ", fmtId(dbname));`
`218`	`220`	`appendStringLiteralConn(&sql, comment, conn);`
`219`	`221`	`appendPQExpBuffer(&sql, ";\n");`
`@@ -231,9 +233,10 @@ main(int argc, char *argv[])`
`231`	`233`	`}`
`232`	`234`
`233`	`235`	`PQclear(result);`
`234`		`- PQfinish(conn);`
`235`	`236`	`}`
`236`	`237`
	`238`	`+ PQfinish(conn);`
	`239`	`+`
`237`	`240`	`exit(0);`
`238`	`241`	`}`
`239`	`242`