diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2017-09-05 10:51:36 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2017-09-05 10:51:36 -0400 |
| commit | 9ae9d8c1549c384dbdb8363e1d932b7311d25c56 (patch) | |
| tree | 70c1db95a90a40a3e7e847675c61fd6b7a4bcb34 /src/bin/psql/help.c | |
| parent | 3955c8c4eda2fd8cb7616285c55d98861382bb3a (diff) | |
Add psql variables showing server version and psql version.
We already had a psql variable VERSION that shows the verbose form of
psql's own version. Add VERSION_NAME to show the short form (e.g.,
"11devel") and VERSION_NUM to show the numeric form (e.g., 110000).
Also add SERVER_VERSION_NAME and SERVER_VERSION_NUM to show the short and
numeric forms of the server's version. (We'd probably add SERVER_VERSION
with the verbose string if it were readily available; but adding another
network round trip to get it seems too expensive.)
The numeric forms, in particular, are expected to be useful for scripting
purposes, now that psql can do conditional tests.
Fabien Coelho, reviewed by Pavel Stehule
Discussion: https://postgr.es/m/alpine.DEB.2.20.1704020917220.4632@lancre
Diffstat (limited to 'src/bin/psql/help.c')
| -rw-r--r-- | src/bin/psql/help.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c index b8cc9d33b89..724cf8e761e 100644 --- a/src/bin/psql/help.c +++ b/src/bin/psql/help.c @@ -336,7 +336,7 @@ helpVariables(unsigned short int pager) * Windows builds currently print one more line than non-Windows builds. * Using the larger number is fine. */ - output = PageOutput(140, pager ? &(pset.popt.topt) : NULL); + output = PageOutput(147, pager ? &(pset.popt.topt) : NULL); fprintf(output, _("List of specially treated variables\n\n")); @@ -387,6 +387,9 @@ helpVariables(unsigned short int pager) " specifies the prompt used during COPY ... FROM STDIN\n")); fprintf(output, _(" QUIET\n" " run quietly (same as -q option)\n")); + fprintf(output, _(" SERVER_VERSION_NAME\n" + " SERVER_VERSION_NUM\n" + " server's version (in short string or numeric format)\n")); fprintf(output, _(" SHOW_CONTEXT\n" " controls display of message context fields [never, errors, always]\n")); fprintf(output, _(" SINGLELINE\n" @@ -397,6 +400,10 @@ helpVariables(unsigned short int pager) " the currently connected database user\n")); fprintf(output, _(" VERBOSITY\n" " controls verbosity of error reports [default, verbose, terse]\n")); + fprintf(output, _(" VERSION\n" + " VERSION_NAME\n" + " VERSION_NUM\n" + " psql's version (in verbose string, short string, or numeric format)\n")); fprintf(output, _("\nDisplay settings:\n")); fprintf(output, _("Usage:\n")); |