From 7fe33a51b962ac3c745f4f820646f8d948960d5e Mon Sep 17 00:00:00 2001 From: Robert Haas Date: Tue, 30 Aug 2011 12:06:40 -0400 Subject: [PATCH] Add --if-exists option to dropdb and dropuser. Josh Kupershmidt, with some further editing by me. --- doc/src/sgml/ref/dropdb.sgml | 10 ++++++++++ doc/src/sgml/ref/dropuser.sgml | 10 ++++++++++ src/bin/scripts/dropdb.c | 11 +++++++++-- src/bin/scripts/dropuser.c | 10 +++++++++- 4 files changed, 38 insertions(+), 3 deletions(-) diff --git a/doc/src/sgml/ref/dropdb.sgml b/doc/src/sgml/ref/dropdb.sgml index e20bcdb53f..aedfa58075 100644 --- a/doc/src/sgml/ref/dropdb.sgml +++ b/doc/src/sgml/ref/dropdb.sgml @@ -86,6 +86,16 @@ PostgreSQL documentation + + + + + Do not throw an error if the database does not exist. A notice is issued + in this case. + + + + diff --git a/doc/src/sgml/ref/dropuser.sgml b/doc/src/sgml/ref/dropuser.sgml index c158103913..c6424b43bb 100644 --- a/doc/src/sgml/ref/dropuser.sgml +++ b/doc/src/sgml/ref/dropuser.sgml @@ -88,6 +88,16 @@ PostgreSQL documentation + + + + + Do not throw an error if the database does not exist. A notice is + issued in this case. + + + + diff --git a/src/bin/scripts/dropdb.c b/src/bin/scripts/dropdb.c index 4cec63ec8e..0e6749efec 100644 --- a/src/bin/scripts/dropdb.c +++ b/src/bin/scripts/dropdb.c @@ -21,6 +21,8 @@ static void help(const char *progname); int main(int argc, char *argv[]) { + static int if_exists = 0; + static struct option long_options[] = { {"host", required_argument, NULL, 'h'}, {"port", required_argument, NULL, 'p'}, @@ -29,6 +31,7 @@ main(int argc, char *argv[]) {"password", no_argument, NULL, 'W'}, {"echo", no_argument, NULL, 'e'}, {"interactive", no_argument, NULL, 'i'}, + {"if-exists", no_argument, &if_exists, 1}, {NULL, 0, NULL, 0} }; @@ -79,6 +82,9 @@ main(int argc, char *argv[]) case 'i': interactive = true; break; + case 0: + /* this covers the long options */ + break; default: fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname); exit(1); @@ -110,8 +116,8 @@ main(int argc, char *argv[]) initPQExpBuffer(&sql); - appendPQExpBuffer(&sql, "DROP DATABASE %s;\n", - fmtId(dbname)); + appendPQExpBuffer(&sql, "DROP DATABASE %s%s;\n", + (if_exists ? "IF EXISTS " : ""), fmtId(dbname)); /* * Connect to the 'postgres' database by default, except have the @@ -146,6 +152,7 @@ help(const char *progname) printf(_("\nOptions:\n")); printf(_(" -e, --echo show the commands being sent to the server\n")); printf(_(" -i, --interactive prompt before deleting anything\n")); + printf(_(" --if-exists don't report error if database doesn't exist\n")); printf(_(" --help show this help, then exit\n")); printf(_(" --version output version information, then exit\n")); printf(_("\nConnection options:\n")); diff --git a/src/bin/scripts/dropuser.c b/src/bin/scripts/dropuser.c index 0949a5eefe..bfd5b1cfd5 100644 --- a/src/bin/scripts/dropuser.c +++ b/src/bin/scripts/dropuser.c @@ -21,6 +21,8 @@ static void help(const char *progname); int main(int argc, char *argv[]) { + static int if_exists = 0; + static struct option long_options[] = { {"host", required_argument, NULL, 'h'}, {"port", required_argument, NULL, 'p'}, @@ -29,6 +31,7 @@ main(int argc, char *argv[]) {"password", no_argument, NULL, 'W'}, {"echo", no_argument, NULL, 'e'}, {"interactive", no_argument, NULL, 'i'}, + {"if-exists", no_argument, &if_exists, 1}, {NULL, 0, NULL, 0} }; @@ -79,6 +82,9 @@ main(int argc, char *argv[]) case 'i': interactive = true; break; + case 0: + /* this covers the long options */ + break; default: fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname); exit(1); @@ -110,7 +116,8 @@ main(int argc, char *argv[]) } initPQExpBuffer(&sql); - appendPQExpBuffer(&sql, "DROP ROLE %s;\n", fmtId(dropuser)); + appendPQExpBuffer(&sql, "DROP ROLE %s%s;\n", + (if_exists ? "IF EXISTS " : ""), fmtId(dropuser)); conn = connectDatabase("postgres", host, port, username, prompt_password, progname); @@ -141,6 +148,7 @@ help(const char *progname) printf(_("\nOptions:\n")); printf(_(" -e, --echo show the commands being sent to the server\n")); printf(_(" -i, --interactive prompt before deleting anything\n")); + printf(_(" --if-exists don't report error if user doesn't exist\n")); printf(_(" --help show this help, then exit\n")); printf(_(" --version output version information, then exit\n")); printf(_("\nConnection options:\n"));