Commit70ad85f

petere

authored and

pull[bot]

committed

Remove environment-variable-based defaults in psql --help

This seemed inconsistent with the --help output of other tools.Depending on the values, it can cause ugly formatting. Also, we'renot getting the defaults from libpq, we're just emulating the methodslibpq uses to derive these values, so they might not be 100% correct.Author: Atsushi Torikoshi <torikoshia@oss.nttdata.com>Discussion:https://www.postgresql.org/message-id/flat/50ca8ff35a8dd8f9ec89963b503571a7@oss.nttdata.com

1 parent8471e21 commit70ad85fCopy full SHA for 70ad85f

File tree

1 file changed

-29

lines changed

src/bin/psql
- help.c

1 file changed

-29

lines changed

`‎src/bin/psql/help.c`

Lines changed: 4 additions & 29 deletions

Original file line number	Diff line number	Diff line change
`@@ -50,22 +50,10 @@`
`50`	`50`	`void`
`51`	`51`	`usage(unsigned shortintpager)`
`52`	`52`	`{`
`53`		`-constchar*env;`
`54`		`-constchar*user;`
`55`		`-char*errstr;`
`56`	`53`	`PQExpBufferDatabuf;`
`57`	`54`	`intnlcount;`
`58`	`55`	`FILE*output;`
`59`	`56`
`60`		`-/* Find default user, in case we need it. */`
`61`		`-user=getenv("PGUSER");`
`62`		`-if (!user)`
`63`		`-{`
`64`		`-user=get_user_name(&errstr);`
`65`		`-if (!user)`
`66`		`-pg_fatal("%s",errstr);`
`67`		`-}`
`68`		`-`
`69`	`57`	`/*`
`70`	`58`	`* To avoid counting the output lines manually, build the output in "buf"`
`71`	`59`	`* and then count them.`
`@@ -77,13 +65,8 @@ usage(unsigned short int pager)`
`77`	`65`	`HELP0(" psql [OPTION]... [DBNAME [USERNAME]]\n\n");`
`78`	`66`
`79`	`67`	`HELP0("General options:\n");`
`80`		`-/* Display default database */`
`81`		`-env=getenv("PGDATABASE");`
`82`		`-if (!env)`
`83`		`-env=user;`
`84`	`68`	`HELP0(" -c, --command=COMMAND run only single command (SQL or internal) and exit\n");`
`85`		`-HELPN(" -d, --dbname=DBNAME database name to connect to (default: \"%s\")\n",`
`86`		`-env);`
	`69`	`+HELP0(" -d, --dbname=DBNAME database name to connect to\n");`
`87`	`70`	`HELP0(" -f, --file=FILENAME execute commands from file, then exit\n");`
`88`	`71`	`HELP0(" -l, --list list available databases, then exit\n");`
`89`	`72`	`HELP0(" -v, --set=, --variable=NAME=VALUE\n"`
`@@ -128,17 +111,9 @@ usage(unsigned short int pager)`
`128`	`111`	`" set record separator for unaligned output to zero byte\n");`
`129`	`112`
`130`	`113`	`HELP0("\nConnection options:\n");`
`131`		`-/* Display default host */`
`132`		`-env=getenv("PGHOST");`
`133`		`-HELPN(" -h, --host=HOSTNAME database server host or socket directory (default: \"%s\")\n",`
`134`		`-env ?env :_("local socket"));`
`135`		`-/* Display default port */`
`136`		`-env=getenv("PGPORT");`
`137`		`-HELPN(" -p, --port=PORT database server port (default: \"%s\")\n",`
`138`		`-env ?env :DEF_PGPORT_STR);`
`139`		`-/* Display default user */`
`140`		`-HELPN(" -U, --username=USERNAME database user name (default: \"%s\")\n",`
`141`		`-user);`
	`114`	`+HELP0(" -h, --host=HOSTNAME database server host or socket directory\n");`
	`115`	`+HELP0(" -p, --port=PORT database server port\n");`
	`116`	`+HELP0(" -U, --username=USERNAME database user name\n");`
`142`	`117`	`HELP0(" -w, --no-password never prompt for password\n");`
`143`	`118`	`HELP0(" -W, --password force password prompt (should happen automatically)\n");`
`144`	`119`

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!

Commit70ad85f

File tree

1 file changed

1 file changed

`‎src/bin/psql/help.c`

0 commit comments