From 0f2abd05441f524a67bc58ef5f0cc32054f7fb66 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Tue, 21 Dec 2021 16:18:41 -0500 Subject: [PATCH] Add help & tab-complete support for psql's \getenv. I forgot about these details in 33d3eeadb :-(. Noted by Christoph Berg. Discussion: https://postgr.es/m/YcI8i/mduMi91uXY@msg.df7cb.de --- src/bin/psql/help.c | 3 ++- src/bin/psql/tab-complete.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c index db12a8b2f3..8cadfbb103 100644 --- a/src/bin/psql/help.c +++ b/src/bin/psql/help.c @@ -166,7 +166,7 @@ slashUsage(unsigned short int pager) * Use "psql --help=commands | wc" to count correctly. It's okay to count * the USE_READLINE line even in builds without that. */ - output = PageOutput(136, pager ? &(pset.popt.topt) : NULL); + output = PageOutput(137, pager ? &(pset.popt.topt) : NULL); fprintf(output, _("General\n")); fprintf(output, _(" \\copyright show PostgreSQL usage and distribution terms\n")); @@ -309,6 +309,7 @@ slashUsage(unsigned short int pager) fprintf(output, _("Operating System\n")); fprintf(output, _(" \\cd [DIR] change the current working directory\n")); + fprintf(output, _(" \\getenv PSQLVAR ENVVAR fetch environment variable\n")); fprintf(output, _(" \\setenv NAME [VALUE] set or unset environment variable\n")); fprintf(output, _(" \\timing [on|off] toggle timing of commands (currently %s)\n"), ON(pset.timing)); diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c index b524dc87fc..cf30239f6d 100644 --- a/src/bin/psql/tab-complete.c +++ b/src/bin/psql/tab-complete.c @@ -1519,7 +1519,7 @@ psql_completion(const char *text, int start, int end) "\\echo", "\\edit", "\\ef", "\\elif", "\\else", "\\encoding", "\\endif", "\\errverbose", "\\ev", "\\f", - "\\g", "\\gdesc", "\\gexec", "\\gset", "\\gx", + "\\g", "\\gdesc", "\\getenv", "\\gexec", "\\gset", "\\gx", "\\help", "\\html", "\\if", "\\include", "\\include_relative", "\\ir", "\\list", "\\lo_import", "\\lo_export", "\\lo_list", "\\lo_unlink",