Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ncIQJ-0004ev-VL for pgsql-hackers@arkaria.postgresql.org; Thu, 07 Apr 2022 03:03:04 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1ncIQI-0007f7-O0 for pgsql-hackers@arkaria.postgresql.org; Thu, 07 Apr 2022 03:03:02 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ncIQI-0007ex-EN for pgsql-hackers@lists.postgresql.org; Thu, 07 Apr 2022 03:03:02 +0000 Received: from sss.pgh.pa.us ([66.207.139.130]) by magus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ncIQF-0004g8-Sk for pgsql-hackers@lists.postgresql.org; Thu, 07 Apr 2022 03:03:01 +0000 Received: from sss1.sss.pgh.pa.us (localhost [127.0.0.1]) by sss.pgh.pa.us (8.15.2/8.15.2) with ESMTP id 23732siX3221982; Wed, 6 Apr 2022 23:02:54 -0400 From: Tom Lane To: "Jonathan S. Katz" cc: "David G. Johnston" , Joe Conway , Alvaro Herrera , PostgreSQL Hackers , Mark Dilger Subject: Re: How about a psql backslash command to show GUCs? In-reply-to: <6693b128-b9e5-fd5e-e8d2-b331dac52cb8@postgresql.org> References: <202204061758.leffczewl4kd@alvherre.pgsql> <3123259.1649270440@sss.pgh.pa.us> <38891fd8-dceb-c956-ec5c-61c1a3e9486d@postgresql.org> <3201870.1649294165@sss.pgh.pa.us> <6693b128-b9e5-fd5e-e8d2-b331dac52cb8@postgresql.org> Comments: In-reply-to "Jonathan S. Katz" message dated "Wed, 06 Apr 2022 21:27:23 -0400" MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0" Content-ID: <3221967.1649300561.0@sss.pgh.pa.us> Date: Wed, 06 Apr 2022 23:02:54 -0400 Message-ID: <3221981.1649300574@sss.pgh.pa.us> List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk ------- =_aaaaaaaaaa0 Content-Type: text/plain; charset="us-ascii" Content-ID: <3221967.1649300561.1@sss.pgh.pa.us> "Jonathan S. Katz" writes: > +1 for \dconf Here's a draft patch using \dconf. No tests or docs yet. regards, tom lane ------- =_aaaaaaaaaa0 Content-Type: text/x-diff; name="add-backslash-dconf-0.1.-patch"; charset="us-ascii" Content-ID: <3221967.1649300561.2@sss.pgh.pa.us> Content-Description: add-backslash-dconf-0.1.-patch Content-Transfer-Encoding: quoted-printable diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c index 079f4a1a76..bbf4a5a44e 100644 --- a/src/bin/psql/command.c +++ b/src/bin/psql/command.c @@ -780,7 +780,14 @@ exec_command_d(PsqlScanState scan_state, bool active_= branch, const char *cmd) success =3D describeTablespaces(pattern, show_verbose); break; case 'c': - success =3D listConversions(pattern, show_verbose, show_system); + if (strncmp(cmd, "dconf", 5) =3D=3D 0) + success =3D describeConfigurationParameters(pattern, + show_verbose, + show_system); + else + success =3D listConversions(pattern, + show_verbose, + show_system); break; case 'C': success =3D listCasts(pattern, show_verbose); diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c index 4dddf08789..e55cfcb2f3 100644 --- a/src/bin/psql/describe.c +++ b/src/bin/psql/describe.c @@ -4430,6 +4430,68 @@ listConversions(const char *pattern, bool verbose, = bool showSystem) return true; } = +/* + * \dconf + * + * Describes configuration parameters. + */ +bool +describeConfigurationParameters(const char *pattern, bool verbose, + bool showSystem) +{ + PQExpBufferData buf; + PGresult *res; + printQueryOpt myopt =3D pset.popt; + + initPQExpBuffer(&buf); + printfPQExpBuffer(&buf, + "SELECT s.name AS \"%s\", s.setting AS \"%s\", " + "s.unit AS \"%s\", s.vartype AS \"%s\"", + gettext_noop("Parameter"), + gettext_noop("Setting"), + gettext_noop("Unit"), + gettext_noop("Type")); + + if (verbose) + { + appendPQExpBuffer(&buf, ", s.context AS \"%s\", ", + gettext_noop("Context")); + if (pset.sversion >=3D 150000) + printACLColumn(&buf, "p.paracl"); + else + appendPQExpBuffer(&buf, "NULL AS \"%s\"", + gettext_noop("Access privileges")); + } + + appendPQExpBufferStr(&buf, "\nFROM pg_catalog.pg_settings s\n"); + + if (verbose && pset.sversion >=3D 150000) + appendPQExpBufferStr(&buf, + " LEFT JOIN pg_catalog.pg_parameter_acl p\n" + " ON pg_catalog.lower(s.name) =3D p.parname\n"); + + processSQLNamePattern(pset.db, &buf, pattern, + false, false, + NULL, "pg_catalog.lower(s.name)", NULL, + NULL); + + appendPQExpBufferStr(&buf, "ORDER BY 1;"); + + res =3D PSQLexec(buf.data); + termPQExpBuffer(&buf); + if (!res) + return false; + + myopt.nullPrint =3D NULL; + myopt.title =3D _("List of configuration parameters"); + myopt.translate_header =3D true; + + printQuery(res, &myopt, pset.queryFout, false, pset.logfile); + + PQclear(res); + return true; +} + /* * \dy * diff --git a/src/bin/psql/describe.h b/src/bin/psql/describe.h index fd6079679c..4eb2710e27 100644 --- a/src/bin/psql/describe.h +++ b/src/bin/psql/describe.h @@ -76,6 +76,10 @@ extern bool listDomains(const char *pattern, bool verbo= se, bool showSystem); /* \dc */ extern bool listConversions(const char *pattern, bool verbose, bool showS= ystem); = +/* \dconf */ +extern bool describeConfigurationParameters(const char *pattern, bool ver= bose, + bool showSystem); + /* \dC */ extern bool listCasts(const char *pattern, bool verbose); = diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c index b3971bce64..eff9d1a16e 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=3Dcommands | wc" to count correctly. It's okay to c= ount * the USE_READLINE line even in builds without that. */ - output =3D PageOutput(137, pager ? &(pset.popt.topt) : NULL); + output =3D PageOutput(138, pager ? &(pset.popt.topt) : NULL); = fprintf(output, _("General\n")); fprintf(output, _(" \\copyright show PostgreSQL usage and d= istribution terms\n")); @@ -231,6 +231,7 @@ slashUsage(unsigned short int pager) fprintf(output, _(" \\dAp[+] [AMPTRN [OPFPTRN]] list support function= s of operator families\n")); fprintf(output, _(" \\db[+] [PATTERN] list tablespaces\n")); fprintf(output, _(" \\dc[S+] [PATTERN] list conversions\n")); + fprintf(output, _(" \\dconf[+] [PATTERN] list configuration paramete= rs\n")); fprintf(output, _(" \\dC[+] [PATTERN] list casts\n")); fprintf(output, _(" \\dd[S] [PATTERN] show object descriptions no= t displayed elsewhere\n")); fprintf(output, _(" \\dD[S+] [PATTERN] list domains\n")); diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c index 32d0b4855f..015037d626 100644 --- a/src/bin/psql/tab-complete.c +++ b/src/bin/psql/tab-complete.c @@ -1690,7 +1690,7 @@ psql_completion(const char *text, int start, int end= ) "\\connect", "\\conninfo", "\\C", "\\cd", "\\copy", "\\copyright", "\\crosstabview", "\\d", "\\da", "\\dA", "\\dAc", "\\dAf", "\\dAo", "\\dAp", - "\\db", "\\dc", "\\dC", "\\dd", "\\ddp", "\\dD", + "\\db", "\\dc", "\\dconf", "\\dC", "\\dd", "\\ddp", "\\dD", "\\des", "\\det", "\\deu", "\\dew", "\\dE", "\\df", "\\dF", "\\dFd", "\\dFp", "\\dFt", "\\dg", "\\di", "\\dl", "\\dL", "\\dm", "\\dn", "\\do", "\\dO", "\\dp", "\\dP", "\\dPi", "\\dPt", @@ -4539,6 +4539,8 @@ psql_completion(const char *text, int start, int end= ) COMPLETE_WITH_QUERY(Query_for_list_of_access_methods); else if (TailMatchesCS("\\db*")) COMPLETE_WITH_QUERY(Query_for_list_of_tablespaces); + else if (TailMatchesCS("\\dconf*")) + COMPLETE_WITH_QUERY(Query_for_list_of_show_vars); else if (TailMatchesCS("\\dD*")) COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_domains); else if (TailMatchesCS("\\des*")) ------- =_aaaaaaaaaa0--