Hi Fujii, Thanks for looking into this
> I'm not sure how useful it is to translate query labels. Isn't it simpler and > safer to leave them untranslated, ensuring that they contain only ASCII > characters? Yes, it is. v2-A does that. It drops the translation at all 84 call sites, so a label can only be ASCII. The cost is that -E shows the English label. > For example, with a Japanese UTF-8 locale and client_encoding=UTF8, > the patch would still send a Japanese label to a LATIN1 database, where > conversion to the database encoding would fail. I missed that the server converts the query once more. If we want to keep the translation, v2-B fixes v1 for this. It sends a label that is not plain ASCII only when the locale encoding, client_encoding and server_encoding are all the same. Thanks, Shihao
From b9ea1747c28d843b0a93875ffea99c9c231bc99f Mon Sep 17 00:00:00 2001 From: shihao zhong <[email protected]> Date: Tue, 13 Oct 2026 07:06:31 -0400 Subject: [PATCH v2] Don't translate psql's hidden query labels. The labels are put in SQL comments sent to the server. A translated label can be in an encoding that differs from client_encoding, and then the server rejects the query. Use the English text, since it is meant for server logs. --- src/bin/psql/command.c | 8 +- src/bin/psql/describe.c | 160 ++++++++++++++++++++-------------------- 2 files changed, 84 insertions(+), 84 deletions(-) diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c index 73c69a1c258..cd2f4d11ecf 100644 --- a/src/bin/psql/command.c +++ b/src/bin/psql/command.c @@ -6222,7 +6222,7 @@ lookup_object_oid(EditableObjectType obj_type, const char *desc, * query to retrieve the function's OID using a cast to regproc or * regprocedure (as appropriate). */ - printfPQExpBuffer(query, "/* %s */\n", _("Get function's OID")); + printfPQExpBuffer(query, "/* %s */\n", "Get function's OID"); appendPQExpBufferStr(query, "SELECT "); appendStringLiteralConn(query, desc, pset.db); appendPQExpBuffer(query, "::pg_catalog.%s::pg_catalog.oid", @@ -6236,7 +6236,7 @@ lookup_object_oid(EditableObjectType obj_type, const char *desc, * this code doesn't check if the relation is actually a view. * We'll detect that in get_create_object_cmd(). */ - printfPQExpBuffer(query, "/* %s */\n", _("Get view's OID")); + printfPQExpBuffer(query, "/* %s */\n", "Get view's OID"); appendPQExpBufferStr(query, "SELECT "); appendStringLiteralConn(query, desc, pset.db); appendPQExpBufferStr(query, "::pg_catalog.regclass::pg_catalog.oid"); @@ -6278,7 +6278,7 @@ get_create_object_cmd(EditableObjectType obj_type, Oid oid, switch (obj_type) { case EditableFunction: - printfPQExpBuffer(query, "/* %s */\n", _("Get function's definition")); + printfPQExpBuffer(query, "/* %s */\n", "Get function's definition"); appendPQExpBuffer(query, "SELECT pg_catalog.pg_get_functiondef(%u)", oid); @@ -6298,7 +6298,7 @@ get_create_object_cmd(EditableObjectType obj_type, Oid oid, * separately. Materialized views (introduced in 9.3) may have * arbitrary storage parameter reloptions. */ - printfPQExpBuffer(query, "/* %s */\n", _("Get view's definition and details")); + printfPQExpBuffer(query, "/* %s */\n", "Get view's definition and details"); if (pset.sversion >= 90400) { appendPQExpBuffer(query, diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c index 5b8c813f687..24aa9b47d9a 100644 --- a/src/bin/psql/describe.c +++ b/src/bin/psql/describe.c @@ -83,7 +83,7 @@ describeAggregates(const char *pattern, bool verbose, bool showSystem) initPQExpBuffer(&buf); - printfPQExpBuffer(&buf, "/* %s */\n", _("Get matching aggregates")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get matching aggregates"); appendPQExpBuffer(&buf, "SELECT n.nspname as \"%s\",\n" " p.proname AS \"%s\",\n" @@ -165,7 +165,7 @@ describeAccessMethods(const char *pattern, bool verbose) initPQExpBuffer(&buf); - printfPQExpBuffer(&buf, "/* %s */\n", _("Get matching access methods")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get matching access methods"); appendPQExpBuffer(&buf, "SELECT amname AS \"%s\",\n" " CASE amtype" @@ -229,7 +229,7 @@ describeTablespaces(const char *pattern, bool verbose) initPQExpBuffer(&buf); - printfPQExpBuffer(&buf, "/* %s */\n", _("Get matching tablespaces")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get matching tablespaces"); appendPQExpBuffer(&buf, "SELECT spcname AS \"%s\",\n" " pg_catalog.pg_get_userbyid(spcowner) AS \"%s\",\n" @@ -340,7 +340,7 @@ describeFunctions(const char *functypes, const char *func_pattern, initPQExpBuffer(&buf); - printfPQExpBuffer(&buf, "/* %s */\n", _("Get matching functions")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get matching functions"); appendPQExpBuffer(&buf, "SELECT n.nspname as \"%s\",\n" " p.proname as \"%s\",\n", @@ -648,7 +648,7 @@ describeTypes(const char *pattern, bool verbose, bool showSystem) initPQExpBuffer(&buf); - printfPQExpBuffer(&buf, "/* %s */\n", _("Get matching types")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get matching types"); appendPQExpBuffer(&buf, "SELECT n.nspname as \"%s\",\n" " pg_catalog.format_type(t.oid, NULL) AS \"%s\",\n", @@ -823,7 +823,7 @@ describeOperators(const char *oper_pattern, * to pre-v14 servers. */ - printfPQExpBuffer(&buf, "/* %s */\n", _("Get matching operators")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get matching operators"); appendPQExpBuffer(&buf, "SELECT n.nspname as \"%s\",\n" " o.oprname AS \"%s\",\n" @@ -957,7 +957,7 @@ listAllDbs(const char *pattern, bool verbose) initPQExpBuffer(&buf); - printfPQExpBuffer(&buf, "/* %s */\n", _("Get matching databases")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get matching databases"); appendPQExpBuffer(&buf, "SELECT\n" " d.datname as \"%s\",\n" @@ -1071,7 +1071,7 @@ permissionsList(const char *pattern, bool showSystem) * we ignore indexes and toast tables since they have no meaningful rights */ printfPQExpBuffer(&buf, "/* %s */\n", - _("Get access privileges of matching relations")); + "Get access privileges of matching relations"); appendPQExpBuffer(&buf, "SELECT n.nspname as \"%s\",\n" " c.relname as \"%s\",\n" @@ -1233,7 +1233,7 @@ listDefaultACLs(const char *pattern) initPQExpBuffer(&buf); - printfPQExpBuffer(&buf, "/* %s */\n", _("Get matching default ACLs")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get matching default ACLs"); appendPQExpBuffer(&buf, "SELECT pg_catalog.pg_get_userbyid(d.defaclrole) AS \"%s\",\n" " n.nspname AS \"%s\",\n" @@ -1315,7 +1315,7 @@ objectDescription(const char *pattern, bool showSystem) initPQExpBuffer(&buf); - printfPQExpBuffer(&buf, "/* %s */\n", _("Get matching object comments")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get matching object comments"); appendPQExpBuffer(&buf, "SELECT DISTINCT tt.nspname AS \"%s\", tt.name AS \"%s\", tt.object AS \"%s\", d.description AS \"%s\"\n" "FROM (\n", @@ -1509,7 +1509,7 @@ describeTableDetails(const char *pattern, bool verbose, bool showSystem) initPQExpBuffer(&buf); printfPQExpBuffer(&buf, "/* %s */\n", - _("Get matching relations to describe")); + "Get matching relations to describe"); appendPQExpBufferStr(&buf, "SELECT c.oid,\n" " n.nspname,\n" @@ -1647,7 +1647,7 @@ describeOneTableDetails(const char *schemaname, /* Get general table info */ printfPQExpBuffer(&buf, "/* %s */\n", - _("Get general information about one relation")); + "Get general information about one relation"); if (pset.sversion >= 120000) { appendPQExpBuffer(&buf, @@ -1780,7 +1780,7 @@ describeOneTableDetails(const char *schemaname, printQueryOpt myopt = pset.popt; char *footers[3] = {NULL, NULL, NULL}; - printfPQExpBuffer(&buf, "/* %s */\n", _("Get sequence information")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get sequence information"); if (pset.sversion >= 100000) { appendPQExpBuffer(&buf, @@ -1835,7 +1835,7 @@ describeOneTableDetails(const char *schemaname, /* Get the column that owns this sequence */ printfPQExpBuffer(&buf, "/* %s */\n", - _("Get the column that owns this sequence")); + "Get the column that owns this sequence"); appendPQExpBuffer(&buf, "SELECT pg_catalog.quote_ident(nspname) || '.' ||" "\n pg_catalog.quote_ident(relname) || '.' ||" "\n pg_catalog.quote_ident(attname)," @@ -1881,7 +1881,7 @@ describeOneTableDetails(const char *schemaname, if (pset.sversion >= 190000) { printfPQExpBuffer(&buf, "/* %s */\n", - _("Get publications containing this sequence")); + "Get publications containing this sequence"); appendPQExpBuffer(&buf, "SELECT pubname FROM pg_catalog.pg_publication p" "\nWHERE p.puballsequences" "\n AND pg_catalog.pg_relation_is_publishable('%s')" @@ -1952,7 +1952,7 @@ describeOneTableDetails(const char *schemaname, */ cols = 0; printfPQExpBuffer(&buf, "/* %s */\n", - _("Get per-column information for one relation")); + "Get per-column information for one relation"); appendPQExpBufferStr(&buf, "SELECT a.attname"); attname_col = cols++; appendPQExpBufferStr(&buf, ",\n pg_catalog.format_type(a.atttypid, a.atttypmod)"); @@ -2256,7 +2256,7 @@ describeOneTableDetails(const char *schemaname, PGresult *result; printfPQExpBuffer(&buf, "/* %s */\n", - _("Get partitioning information for this partition")); + "Get partitioning information for this partition"); appendPQExpBufferStr(&buf, "SELECT inhparent::pg_catalog.regclass,\n" " pg_catalog.pg_get_expr(c.relpartbound, c.oid),\n "); @@ -2313,7 +2313,7 @@ describeOneTableDetails(const char *schemaname, PGresult *result; printfPQExpBuffer(&buf, "/* %s */\n", - _("Get partitioning information for this table")); + "Get partitioning information for this table"); appendPQExpBuffer(&buf, "SELECT pg_catalog.pg_get_partkeydef('%s'::pg_catalog.oid);", oid); @@ -2337,7 +2337,7 @@ describeOneTableDetails(const char *schemaname, PGresult *result; printfPQExpBuffer(&buf, "/* %s */\n", - _("Get the table that owns this TOAST table")); + "Get the table that owns this TOAST table"); appendPQExpBuffer(&buf, "SELECT n.nspname, c.relname\n" "FROM pg_catalog.pg_class c" @@ -2366,7 +2366,7 @@ describeOneTableDetails(const char *schemaname, /* Footer information about an index */ PGresult *result; - printfPQExpBuffer(&buf, "/* %s */\n", _("Get index details")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get index details"); appendPQExpBufferStr(&buf, "SELECT i.indisunique, i.indisprimary, i.indisclustered, " "i.indisvalid,\n" @@ -2488,7 +2488,7 @@ describeOneTableDetails(const char *schemaname, /* print indexes */ if (tableinfo.hasindex) { - printfPQExpBuffer(&buf, "/* %s */\n", _("Get indexes for this table")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get indexes for this table"); appendPQExpBufferStr(&buf, "SELECT c2.relname, i.indisprimary, i.indisunique, " "i.indisclustered, i.indisvalid, " @@ -2594,7 +2594,7 @@ describeOneTableDetails(const char *schemaname, if (tableinfo.checks) { printfPQExpBuffer(&buf, "/* %s */\n", - _("Get check constraints for this table")); + "Get check constraints for this table"); appendPQExpBuffer(&buf, "SELECT r.conname, " "pg_catalog.pg_get_constraintdef(r.oid, true)\n" @@ -2627,7 +2627,7 @@ describeOneTableDetails(const char *schemaname, /* Print foreign-key constraints */ printfPQExpBuffer(&buf, "/* %s */\n", - _("Get foreign key constraints for this table")); + "Get foreign key constraints for this table"); if (pset.sversion >= 120000 && (tableinfo.ispartition || tableinfo.relkind == RELKIND_PARTITIONED_TABLE)) { @@ -2699,7 +2699,7 @@ describeOneTableDetails(const char *schemaname, /* print incoming foreign-key references */ printfPQExpBuffer(&buf, "/* %s */\n", - _("Get foreign keys referencing this table")); + "Get foreign keys referencing this table"); if (pset.sversion >= 120000) { appendPQExpBuffer(&buf, @@ -2752,7 +2752,7 @@ describeOneTableDetails(const char *schemaname, if (pset.sversion >= 90500) { printfPQExpBuffer(&buf, "/* %s */\n", - _("Get row-level policies for this table")); + "Get row-level policies for this table"); appendPQExpBufferStr(&buf, "SELECT pol.polname,"); if (pset.sversion >= 100000) appendPQExpBufferStr(&buf, @@ -2836,7 +2836,7 @@ describeOneTableDetails(const char *schemaname, if (pset.sversion >= 140000) { printfPQExpBuffer(&buf, "/* %s */\n", - _("Get extended statistics for this table")); + "Get extended statistics for this table"); appendPQExpBuffer(&buf, "SELECT oid, " "stxrelid::pg_catalog.regclass, " @@ -2936,7 +2936,7 @@ describeOneTableDetails(const char *schemaname, else if (pset.sversion >= 100000) { printfPQExpBuffer(&buf, "/* %s */\n", - _("Get extended statistics for this table")); + "Get extended statistics for this table"); appendPQExpBufferStr(&buf, "SELECT oid, " "stxrelid::pg_catalog.regclass, " @@ -3017,7 +3017,7 @@ describeOneTableDetails(const char *schemaname, if (tableinfo.hasrules && tableinfo.relkind != RELKIND_MATVIEW) { printfPQExpBuffer(&buf, "/* %s */\n", - _("Get rules for this relation")); + "Get rules for this relation"); appendPQExpBuffer(&buf, "SELECT r.rulename, trim(trailing ';' from pg_catalog.pg_get_ruledef(r.oid, true)), " "ev_enabled\n" @@ -3102,7 +3102,7 @@ describeOneTableDetails(const char *schemaname, if (pset.sversion >= 100000) { printfPQExpBuffer(&buf, "/* %s */\n", - _("Get publications that publish this table")); + "Get publications that publish this table"); if (pset.sversion >= 150000) { appendPQExpBuffer(&buf, @@ -3216,7 +3216,7 @@ describeOneTableDetails(const char *schemaname, if (pset.sversion >= 190000) { printfPQExpBuffer(&buf, "/* %s */\n", - _("Get publications that exclude this table")); + "Get publications that exclude this table"); appendPQExpBuffer(&buf, "SELECT pubname\n" "FROM pg_catalog.pg_publication p\n" @@ -3250,7 +3250,7 @@ describeOneTableDetails(const char *schemaname, if (verbose) { printfPQExpBuffer(&buf, "/* %s */\n", - _("Get not-null constraints for this table")); + "Get not-null constraints for this table"); appendPQExpBuffer(&buf, "SELECT c.conname, a.attname, c.connoinherit,\n" " c.conislocal, c.coninhcount <> 0,\n" @@ -3300,7 +3300,7 @@ describeOneTableDetails(const char *schemaname, { PGresult *result; - printfPQExpBuffer(&buf, "/* %s */\n", _("Get view's definition")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get view's definition"); appendPQExpBuffer(&buf, "SELECT pg_catalog.pg_get_viewdef('%s'::pg_catalog.oid, true);", oid); @@ -3325,7 +3325,7 @@ describeOneTableDetails(const char *schemaname, /* print rules */ if (tableinfo.hasrules) { - printfPQExpBuffer(&buf, "/* %s */\n", _("Get rules for this view")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get rules for this view"); appendPQExpBuffer(&buf, "SELECT r.rulename, trim(trailing ';' from pg_catalog.pg_get_ruledef(r.oid, true))\n" "FROM pg_catalog.pg_rewrite r\n" @@ -3364,7 +3364,7 @@ describeOneTableDetails(const char *schemaname, int tuples; printfPQExpBuffer(&buf, "/* %s */\n", - _("Get triggers for this relation")); + "Get triggers for this relation"); appendPQExpBufferStr(&buf, "SELECT t.tgname, " "pg_catalog.pg_get_triggerdef(t.oid, true), " @@ -3549,7 +3549,7 @@ describeOneTableDetails(const char *schemaname, /* Footer information about foreign table */ printfPQExpBuffer(&buf, "/* %s */\n", - _("Get foreign server for this table")); + "Get foreign server for this table"); appendPQExpBuffer(&buf, "SELECT s.srvname,\n" " pg_catalog.array_to_string(ARRAY(\n" @@ -3586,7 +3586,7 @@ describeOneTableDetails(const char *schemaname, /* print tables inherited from (exclude partitioned parents) */ printfPQExpBuffer(&buf, "/* %s */\n", - _("Get inheritance parent tables")); + "Get inheritance parent tables"); appendPQExpBuffer(&buf, "SELECT c.oid::pg_catalog.regclass\n" "FROM pg_catalog.pg_class c, pg_catalog.pg_inherits i\n" @@ -3621,7 +3621,7 @@ describeOneTableDetails(const char *schemaname, } /* print child tables (with additional info if partitions) */ - printfPQExpBuffer(&buf, "/* %s */\n", _("Get child tables")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get child tables"); if (pset.sversion >= 140000) appendPQExpBuffer(&buf, "SELECT c.oid::pg_catalog.regclass, c.relkind," @@ -3816,7 +3816,7 @@ add_tablespace_footer(printTableContent *const cont, char relkind, initPQExpBuffer(&buf); printfPQExpBuffer(&buf, "/* %s */\n", - _("Get tablespace information for this relation")); + "Get tablespace information for this relation"); appendPQExpBuffer(&buf, "SELECT spcname FROM pg_catalog.pg_tablespace\n" "WHERE oid = '%u';", tablespace); @@ -3878,7 +3878,7 @@ describeRoles(const char *pattern, bool verbose, bool showSystem) initPQExpBuffer(&buf); - printfPQExpBuffer(&buf, "/* %s */\n", _("Get matching roles")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get matching roles"); appendPQExpBufferStr(&buf, "SELECT r.rolname, r.rolsuper, r.rolinherit,\n" " r.rolcreaterole, r.rolcreatedb, r.rolcanlogin,\n" @@ -4018,7 +4018,7 @@ listDbRoleSettings(const char *pattern, const char *pattern2) initPQExpBuffer(&buf); - printfPQExpBuffer(&buf, "/* %s */\n", _("Get per-database and per-role settings")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get per-database and per-role settings"); appendPQExpBuffer(&buf, "SELECT rolname AS \"%s\", datname AS \"%s\",\n" "pg_catalog.array_to_string(setconfig, E'\\n') AS \"%s\"\n" "FROM pg_catalog.pg_db_role_setting s\n" @@ -4086,7 +4086,7 @@ describeRoleGrants(const char *pattern, bool showSystem) printQueryOpt myopt = pset.popt; initPQExpBuffer(&buf); - printfPQExpBuffer(&buf, "/* %s */\n", _("Get matching role grants")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get matching role grants"); appendPQExpBuffer(&buf, "SELECT m.rolname AS \"%s\", r.rolname AS \"%s\",\n" " pg_catalog.concat_ws(', ',\n", @@ -4184,7 +4184,7 @@ listTables(const char *tabtypes, const char *pattern, bool verbose, bool showSys initPQExpBuffer(&buf); - printfPQExpBuffer(&buf, "/* %s */\n", _("Get matching relations")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get matching relations"); appendPQExpBuffer(&buf, "SELECT n.nspname as \"%s\",\n" " c.relname as \"%s\",\n" @@ -4459,7 +4459,7 @@ listPartitionedTables(const char *reltypes, const char *pattern, bool verbose) initPQExpBuffer(&buf); printfPQExpBuffer(&buf, "/* %s */\n", - _("Get matching partitioned relations")); + "Get matching partitioned relations"); appendPQExpBuffer(&buf, "SELECT n.nspname as \"%s\",\n" " c.relname as \"%s\",\n" @@ -4635,7 +4635,7 @@ listLanguages(const char *pattern, bool verbose, bool showSystem) initPQExpBuffer(&buf); - printfPQExpBuffer(&buf, "/* %s */\n", _("Get matching procedural languages")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get matching procedural languages"); appendPQExpBuffer(&buf, "SELECT l.lanname AS \"%s\",\n" " pg_catalog.pg_get_userbyid(l.lanowner) as \"%s\",\n" @@ -4712,7 +4712,7 @@ listDomains(const char *pattern, bool verbose, bool showSystem) initPQExpBuffer(&buf); - printfPQExpBuffer(&buf, "/* %s */\n", _("Get matching domains")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get matching domains"); appendPQExpBuffer(&buf, "SELECT n.nspname as \"%s\",\n" " t.typname as \"%s\",\n" @@ -4798,7 +4798,7 @@ listConversions(const char *pattern, bool verbose, bool showSystem) initPQExpBuffer(&buf); - printfPQExpBuffer(&buf, "/* %s */\n", _("Get matching conversions")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get matching conversions"); appendPQExpBuffer(&buf, "SELECT n.nspname AS \"%s\",\n" " c.conname AS \"%s\",\n" @@ -4879,7 +4879,7 @@ describeConfigurationParameters(const char *pattern, bool verbose, initPQExpBuffer(&buf); printfPQExpBuffer(&buf, "/* %s */\n", - _("Get matching configuration parameters")); + "Get matching configuration parameters"); appendPQExpBuffer(&buf, "SELECT s.name AS \"%s\", " "pg_catalog.current_setting(s.name) AS \"%s\"", @@ -4960,7 +4960,7 @@ listEventTriggers(const char *pattern, bool verbose) initPQExpBuffer(&buf); - printfPQExpBuffer(&buf, "/* %s */\n", _("Get matching event triggers")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get matching event triggers"); appendPQExpBuffer(&buf, "SELECT evtname as \"%s\", " "evtevent as \"%s\", " @@ -5039,7 +5039,7 @@ listExtendedStats(const char *pattern, bool verbose) initPQExpBuffer(&buf); - printfPQExpBuffer(&buf, "/* %s */\n", _("Get matching extended statistics")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get matching extended statistics"); appendPQExpBuffer(&buf, "SELECT \n" "es.stxnamespace::pg_catalog.regnamespace::pg_catalog.text AS \"%s\", \n" @@ -5133,7 +5133,7 @@ listCasts(const char *pattern, bool verbose) initPQExpBuffer(&buf); - printfPQExpBuffer(&buf, "/* %s */\n", _("Get matching casts")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get matching casts"); appendPQExpBuffer(&buf, "SELECT pg_catalog.format_type(castsource, NULL) AS \"%s\",\n" " pg_catalog.format_type(casttarget, NULL) AS \"%s\",\n", @@ -5258,7 +5258,7 @@ listCollations(const char *pattern, bool verbose, bool showSystem) initPQExpBuffer(&buf); - printfPQExpBuffer(&buf, "/* %s */\n", _("Get matching collations")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get matching collations"); appendPQExpBuffer(&buf, "SELECT\n" " n.nspname AS \"%s\",\n" @@ -5383,7 +5383,7 @@ listSchemas(const char *pattern, bool verbose, bool showSystem) initPQExpBuffer(&buf); - printfPQExpBuffer(&buf, "/* %s */\n", _("Get matching schemas")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get matching schemas"); appendPQExpBuffer(&buf, "SELECT n.nspname AS \"%s\",\n" " pg_catalog.pg_get_userbyid(n.nspowner) AS \"%s\"", @@ -5428,7 +5428,7 @@ listSchemas(const char *pattern, bool verbose, bool showSystem) int i; printfPQExpBuffer(&buf, "/* %s */\n", - _("Get publications that publish this schema")); + "Get publications that publish this schema"); appendPQExpBuffer(&buf, "SELECT pubname \n" "FROM pg_catalog.pg_publication p\n" @@ -5509,7 +5509,7 @@ listTSParsers(const char *pattern, bool verbose) initPQExpBuffer(&buf); - printfPQExpBuffer(&buf, "/* %s */\n", _("Get matching text search parsers")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get matching text search parsers"); appendPQExpBuffer(&buf, "SELECT\n" " n.nspname as \"%s\",\n" @@ -5559,7 +5559,7 @@ listTSParsersVerbose(const char *pattern) initPQExpBuffer(&buf); - printfPQExpBuffer(&buf, "/* %s */\n", _("Get matching text search parsers")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get matching text search parsers"); appendPQExpBufferStr(&buf, "SELECT p.oid,\n" " n.nspname,\n" @@ -5637,7 +5637,7 @@ describeOneTSParser(const char *oid, const char *nspname, const char *prsname) initPQExpBuffer(&buf); - printfPQExpBuffer(&buf, "/* %s */\n", _("Get text search parser details")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get text search parser details"); appendPQExpBuffer(&buf, "SELECT '%s' AS \"%s\",\n" " p.prsstart::pg_catalog.regproc AS \"%s\",\n" @@ -5707,7 +5707,7 @@ describeOneTSParser(const char *oid, const char *nspname, const char *prsname) initPQExpBuffer(&buf); printfPQExpBuffer(&buf, "/* %s */\n", - _("Get text search parser token types")); + "Get text search parser token types"); appendPQExpBuffer(&buf, "SELECT t.alias as \"%s\",\n" " t.description as \"%s\"\n" @@ -5758,7 +5758,7 @@ listTSDictionaries(const char *pattern, bool verbose) initPQExpBuffer(&buf); - printfPQExpBuffer(&buf, "/* %s */\n", _("Get matching text search dictionaries")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get matching text search dictionaries"); appendPQExpBuffer(&buf, "SELECT\n" " n.nspname as \"%s\",\n" @@ -5824,7 +5824,7 @@ listTSTemplates(const char *pattern, bool verbose) initPQExpBuffer(&buf); - printfPQExpBuffer(&buf, "/* %s */\n", _("Get matching text search templates")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get matching text search templates"); if (verbose) appendPQExpBuffer(&buf, "SELECT\n" @@ -5893,7 +5893,7 @@ listTSConfigs(const char *pattern, bool verbose) initPQExpBuffer(&buf); - printfPQExpBuffer(&buf, "/* %s */\n", _("Get matching text search configurations")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get matching text search configurations"); appendPQExpBuffer(&buf, "SELECT\n" " n.nspname as \"%s\",\n" @@ -5940,7 +5940,7 @@ listTSConfigsVerbose(const char *pattern) initPQExpBuffer(&buf); - printfPQExpBuffer(&buf, "/* %s */\n", _("Get matching text search configurations")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get matching text search configurations"); appendPQExpBufferStr(&buf, "SELECT c.oid, c.cfgname,\n" " n.nspname,\n" @@ -6027,7 +6027,7 @@ describeOneTSConfig(const char *oid, const char *nspname, const char *cfgname, initPQExpBuffer(&buf); - printfPQExpBuffer(&buf, "/* %s */\n", _("Get text search configuration details")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get text search configuration details"); appendPQExpBuffer(&buf, "SELECT\n" " ( SELECT t.alias FROM\n" @@ -6097,7 +6097,7 @@ listForeignDataWrappers(const char *pattern, bool verbose) initPQExpBuffer(&buf); - printfPQExpBuffer(&buf, "/* %s */\n", _("Get matching foreign-data wrappers")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get matching foreign-data wrappers"); appendPQExpBuffer(&buf, "SELECT fdw.fdwname AS \"%s\",\n" " pg_catalog.pg_get_userbyid(fdw.fdwowner) AS \"%s\",\n" @@ -6170,7 +6170,7 @@ listForeignServers(const char *pattern, bool verbose) initPQExpBuffer(&buf); - printfPQExpBuffer(&buf, "/* %s */\n", _("Get matching foreign servers")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get matching foreign servers"); appendPQExpBuffer(&buf, "SELECT s.srvname AS \"%s\",\n" " pg_catalog.pg_get_userbyid(s.srvowner) AS \"%s\",\n" @@ -6248,7 +6248,7 @@ listUserMappings(const char *pattern, bool verbose) initPQExpBuffer(&buf); - printfPQExpBuffer(&buf, "/* %s */\n", _("Get matching user mappings")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get matching user mappings"); appendPQExpBuffer(&buf, "SELECT um.srvname AS \"%s\",\n" " um.usename AS \"%s\"", @@ -6305,7 +6305,7 @@ listForeignTables(const char *pattern, bool verbose) initPQExpBuffer(&buf); - printfPQExpBuffer(&buf, "/* %s */\n", _("Get matching foreign tables")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get matching foreign tables"); appendPQExpBuffer(&buf, "SELECT n.nspname AS \"%s\",\n" " c.relname AS \"%s\",\n" @@ -6379,7 +6379,7 @@ listExtensions(const char *pattern) initPQExpBuffer(&buf); - printfPQExpBuffer(&buf, "/* %s */\n", _("Get matching installed extensions")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get matching installed extensions"); appendPQExpBuffer(&buf, "SELECT e.extname AS \"%s\", " "e.extversion AS \"%s\", ae.default_version AS \"%s\"," @@ -6435,7 +6435,7 @@ listExtensionContents(const char *pattern) initPQExpBuffer(&buf); - printfPQExpBuffer(&buf, "/* %s */\n", _("Get matching installed extensions")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get matching installed extensions"); appendPQExpBufferStr(&buf, "SELECT e.extname, e.oid\n" "FROM pg_catalog.pg_extension e\n"); @@ -6505,7 +6505,7 @@ listOneExtensionContents(const char *extname, const char *oid) initPQExpBuffer(&buf); - printfPQExpBuffer(&buf, "/* %s */\n", _("Get installed extension's contents")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get installed extension's contents"); appendPQExpBuffer(&buf, "SELECT pg_catalog.pg_describe_object(classid, objid, 0) AS \"%s\"\n" "FROM pg_catalog.pg_depend\n" @@ -6614,7 +6614,7 @@ listPublications(const char *pattern) initPQExpBuffer(&buf); - printfPQExpBuffer(&buf, "/* %s */\n", _("Get matching publications")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get matching publications"); appendPQExpBuffer(&buf, "SELECT pubname AS \"%s\",\n" " pg_catalog.pg_get_userbyid(pubowner) AS \"%s\",\n" @@ -6766,7 +6766,7 @@ describePublications(const char *pattern) initPQExpBuffer(&buf); - printfPQExpBuffer(&buf, "/* %s */\n", _("Get details about matching publications")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get details about matching publications"); appendPQExpBufferStr(&buf, "SELECT oid, pubname,\n" " pg_catalog.pg_get_userbyid(pubowner) AS owner,\n" @@ -6904,7 +6904,7 @@ describePublications(const char *pattern) { /* Get the tables for the specified publication */ printfPQExpBuffer(&buf, "/* %s */\n", - _("Get tables published by this publication")); + "Get tables published by this publication"); appendPQExpBufferStr(&buf, "SELECT n.nspname, c.relname"); if (pset.sversion >= 150000) { @@ -6942,7 +6942,7 @@ describePublications(const char *pattern) { /* Get the schemas for the specified publication */ printfPQExpBuffer(&buf, "/* %s */\n", - _("Get schemas published by this publication")); + "Get schemas published by this publication"); appendPQExpBuffer(&buf, "SELECT n.nspname\n" "FROM pg_catalog.pg_namespace n\n" @@ -6960,7 +6960,7 @@ describePublications(const char *pattern) { /* Get tables in the EXCEPT clause for this publication */ printfPQExpBuffer(&buf, "/* %s */\n", - _("Get tables excluded by this publication")); + "Get tables excluded by this publication"); appendPQExpBuffer(&buf, "SELECT n.nspname || '.' || c.relname\n" "FROM pg_catalog.pg_class c\n" @@ -7021,7 +7021,7 @@ describeSubscriptions(const char *pattern, bool verbose) initPQExpBuffer(&buf); - printfPQExpBuffer(&buf, "/* %s */\n", _("Get matching subscriptions")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get matching subscriptions"); appendPQExpBuffer(&buf, "SELECT subname AS \"%s\"\n" ", pg_catalog.pg_get_userbyid(subowner) AS \"%s\"\n" @@ -7191,7 +7191,7 @@ listOperatorClasses(const char *access_method_pattern, initPQExpBuffer(&buf); - printfPQExpBuffer(&buf, "/* %s */\n", _("Get matching operator classes")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get matching operator classes"); appendPQExpBuffer(&buf, "SELECT\n" " am.amname AS \"%s\",\n" @@ -7293,7 +7293,7 @@ listOperatorFamilies(const char *access_method_pattern, initPQExpBuffer(&buf); - printfPQExpBuffer(&buf, "/* %s */\n", _("Get matching operator families")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get matching operator families"); appendPQExpBuffer(&buf, "SELECT\n" " am.amname AS \"%s\",\n" @@ -7384,7 +7384,7 @@ listOpFamilyOperators(const char *access_method_pattern, initPQExpBuffer(&buf); - printfPQExpBuffer(&buf, "/* %s */\n", _("Get operators of matching operator families")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get operators of matching operator families"); appendPQExpBuffer(&buf, "SELECT\n" " am.amname AS \"%s\",\n" @@ -7492,7 +7492,7 @@ listOpFamilyFunctions(const char *access_method_pattern, initPQExpBuffer(&buf); printfPQExpBuffer(&buf, "/* %s */\n", - _("Get support functions of matching operator families")); + "Get support functions of matching operator families"); appendPQExpBuffer(&buf, "SELECT\n" " am.amname AS \"%s\",\n" @@ -7579,7 +7579,7 @@ listLargeObjects(bool verbose) initPQExpBuffer(&buf); - printfPQExpBuffer(&buf, "/* %s */\n", _("Get large objects")); + printfPQExpBuffer(&buf, "/* %s */\n", "Get large objects"); appendPQExpBuffer(&buf, "SELECT oid as \"%s\",\n" " pg_catalog.pg_get_userbyid(lomowner) as \"%s\",\n ", -- 2.37.1 (Apple Git-137.1)
v2-B-0001-psql-Don-t-send-hidden-query-labels-the-server-co.patch
Description: Binary data
v2-A-0001-Don-t-translate-psql-s-hidden-query-labels.patch
Description: Binary data
