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

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
index 9b72eac..544f2f6 100644 (file)
--- 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
index 1cf18fd..48f73ae 100644 (file)
--- 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);