database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-29 13:56:47 +03:00
Code

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

Browse Source 
shared description table for pg_database comments.

Also update comments about database name selection.
This commit is contained in:
Bruce Momjian 2011-05-10 19:44:15 -04:00
parent 87631ac98d
commit 7ff7711919
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/bin/scripts/createdb.c
View File

@ -192,6 +192,11 @@ main(int argc, char *argv[])
appendPQExpBuffer(&sql, ";\n"); 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", conn = connectDatabase(strcmp(dbname, "postgres") == 0 ? "template1" : "postgres",
host, port, username, prompt_password, progname); host, port, username, prompt_password, progname);
@ -208,12 +213,9 @@ main(int argc, char *argv[])
} }
PQclear(result); PQclear(result);
PQfinish(conn);
if (comment) if (comment)
{ {
conn = connectDatabase(dbname, host, port, username, prompt_password, progname);
printfPQExpBuffer(&sql, "COMMENT ON DATABASE %s IS ", fmtId(dbname)); printfPQExpBuffer(&sql, "COMMENT ON DATABASE %s IS ", fmtId(dbname));
appendStringLiteralConn(&sql, comment, conn); appendStringLiteralConn(&sql, comment, conn);
appendPQExpBuffer(&sql, ";\n"); appendPQExpBuffer(&sql, ";\n");
@ -231,9 +233,10 @@ main(int argc, char *argv[])
} }
PQclear(result); PQclear(result);
PQfinish(conn);
} }
PQfinish(conn);
exit(0); exit(0);
} }

5
src/bin/scripts/dropdb.c
View File

@ -113,6 +113,11 @@ main(int argc, char *argv[])
appendPQExpBuffer(&sql, "DROP DATABASE %s;\n", appendPQExpBuffer(&sql, "DROP DATABASE %s;\n",
fmtId(dbname)); 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", conn = connectDatabase(strcmp(dbname, "postgres") == 0 ? "template1" : "postgres",
host, port, username, prompt_password, progname); host, port, username, prompt_password, progname);