NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit80e05a0

Amit Kapila

committed

Add the support for '-f' option in dropdb utility.

Specifying '-f' will add the 'force' option to the DROP DATABASE commandsent to the server. This will try to terminate all existing connectionsto the target database before dropping it.Author: Pavel StehuleReviewed-by: Vignesh C and Amit KapilaDiscussion:https://postgr.es/m/CAP_rwwmLJJbn70vLOZFpxGw3XD7nLB_7+NKz46H5EOO2k5H7OQ@mail.gmail.com

1 parenteecf963 commit80e05a0Copy full SHA for 80e05a0

File tree

3 files changed

+30

-4

lines changed

doc/src/sgml/ref
- dropdb.sgml
src/bin/scripts
- dropdb.c
- t
  - 050_dropdb.pl

3 files changed

+30

-4

lines changed

`‎doc/src/sgml/ref/dropdb.sgml`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,18 @@ PostgreSQL documentation`
`86`	`86`	`</listitem>`
`87`	`87`	`</varlistentry>`
`88`	`88`
	`89`	`+ <varlistentry>`
	`90`	`+ <term><option>-f</option></term>`
	`91`	`+ <term><option>--force</option></term>`
	`92`	`+ <listitem>`
	`93`	`+ <para>`
	`94`	`+ Attempt to terminate all existing connections to the target database`
	`95`	`+ before dropping it. See <xref linkend="sql-dropdatabase"/> for more`
	`96`	`+ information on this option.`
	`97`	`+ </para>`
	`98`	`+ </listitem>`
	`99`	`+ </varlistentry>`
	`100`	`+`
`89`	`101`	`<varlistentry>`
`90`	`102`	`<term><option>-V</option></term>`
`91`	`103`	`<term><option>--version</option></term>`

`‎src/bin/scripts/dropdb.c`

Lines changed: 11 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ main(int argc, char *argv[])`
`34`	`34`	`{"interactive",no_argument,NULL,'i'},`
`35`	`35`	`{"if-exists",no_argument,&if_exists,1},`
`36`	`36`	`{"maintenance-db",required_argument,NULL,2},`
	`37`	`+{"force",no_argument,NULL,'f'},`
`37`	`38`	`{NULL,0,NULL,0}`
`38`	`39`	`};`
`39`	`40`
`@@ -49,6 +50,7 @@ main(int argc, char *argv[])`
`49`	`50`	`enumtrivalueprompt_password=TRI_DEFAULT;`
`50`	`51`	`boolecho= false;`
`51`	`52`	`boolinteractive= false;`
	`53`	`+boolforce= false;`
`52`	`54`
`53`	`55`	`PQExpBufferDatasql;`
`54`	`56`
`@@ -61,7 +63,7 @@ main(int argc, char *argv[])`
`61`	`63`
`62`	`64`	`handle_help_version_opts(argc,argv,"dropdb",help);`
`63`	`65`
`64`		`-while ((c=getopt_long(argc,argv,"h:p:U:wWei",long_options,&optindex))!=-1)`
	`66`	`+while ((c=getopt_long(argc,argv,"h:p:U:wWeif",long_options,&optindex))!=-1)`
`65`	`67`	`{`
`66`	`68`	`switch (c)`
`67`	`69`	`{`
`@@ -86,6 +88,9 @@ main(int argc, char *argv[])`
`86`	`88`	`case'i':`
`87`	`89`	`interactive= true;`
`88`	`90`	`break;`
	`91`	`+case'f':`
	`92`	`+force= true;`
	`93`	`+break;`
`89`	`94`	`case0:`
`90`	`95`	`/* this covers the long options */`
`91`	`96`	`break;`
`@@ -123,8 +128,10 @@ main(int argc, char *argv[])`
`123`	`128`
`124`	`129`	`initPQExpBuffer(&sql);`
`125`	`130`
`126`		`-appendPQExpBuffer(&sql,"DROP DATABASE %s%s;",`
`127`		`- (if_exists ?"IF EXISTS " :""),fmtId(dbname));`
	`131`	`+appendPQExpBuffer(&sql,"DROP DATABASE %s%s%s;",`
	`132`	`+ (if_exists ?"IF EXISTS " :""),`
	`133`	`+fmtId(dbname),`
	`134`	`+force ?" WITH (FORCE)" :"");`
`128`	`135`
`129`	`136`	`/* Avoid trying to drop postgres db while we are connected to it. */`
`130`	`137`	`if (maintenance_db==NULL&&strcmp(dbname,"postgres")==0)`
`@@ -159,6 +166,7 @@ help(const char *progname)`
`159`	`166`	`printf(_("\nOptions:\n"));`
`160`	`167`	`printf(_(" -e, --echo show the commands being sent to the server\n"));`
`161`	`168`	`printf(_(" -i, --interactive prompt before deleting anything\n"));`
	`169`	`+printf(_(" -f, --force try to terminate other connections before dropping\n"));`
`162`	`170`	`printf(_(" -V, --version output version information, then exit\n"));`
`163`	`171`	`printf(_(" --if-exists don't report error if database doesn't exist\n"));`
`164`	`172`	`printf(_(" -?, --help show this help, then exit\n"));`

`‎src/bin/scripts/t/050_dropdb.pl`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`use PostgresNode;`
`5`	`5`	`use TestLib;`
`6`		`-use Test::Moretests=>11;`
	`6`	`+use Test::Moretests=>13;`
`7`	`7`
`8`	`8`	`program_help_ok('dropdb');`
`9`	`9`	`program_version_ok('dropdb');`
`@@ -19,5 +19,11 @@`
`19`	`19`	`qr/statement: DROP DATABASE foobar1/,`
`20`	`20`	`'SQL DROP DATABASE run');`
`21`	`21`
	`22`	`+$node->safe_psql('postgres','CREATE DATABASE foobar2');`
	`23`	`+$node->issues_sql_like(`
	`24`	`+['dropdb','--force','foobar2' ],`
	`25`	`+qr/statement: DROP DATABASE foobar2 WITH$FORCE$;/,`
	`26`	`+'SQL DROP DATABASE (FORCE) run');`
	`27`	`+`
`22`	`28`	`$node->command_fails(['dropdb','nonexistent' ],`
`23`	`29`	`'fails with nonexistent database');`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit80e05a0

File tree

3 files changed

3 files changed

`‎doc/src/sgml/ref/dropdb.sgml`

`‎src/bin/scripts/dropdb.c`

`‎src/bin/scripts/t/050_dropdb.pl`

0 commit comments