Commit f5067049 authored by Peter Eisentraut's avatar Peter Eisentraut

psql: Clean up terminology in \dAp command

The preferred terminology has been support "function", not procedure,
for some time, so change that over.  The command stays \dAp, since
\dAf is already something else.
parent 3fa44a30
...@@ -1309,7 +1309,7 @@ testdb=> ...@@ -1309,7 +1309,7 @@ testdb=>
</term> </term>
<listitem> <listitem>
<para> <para>
Lists procedures associated with operator families Lists functions associated with operator families
(<xref linkend="catalog-pg-amproc"/>). (<xref linkend="catalog-pg-amproc"/>).
If <replaceable class="parameter">access-method-pattern</replaceable> If <replaceable class="parameter">access-method-pattern</replaceable>
is specified, only members of operator families associated with access is specified, only members of operator families associated with access
......
...@@ -747,7 +747,7 @@ exec_command_d(PsqlScanState scan_state, bool active_branch, const char *cmd) ...@@ -747,7 +747,7 @@ exec_command_d(PsqlScanState scan_state, bool active_branch, const char *cmd)
success = listOpFamilyOperators(pattern, pattern2, show_verbose); success = listOpFamilyOperators(pattern, pattern2, show_verbose);
break; break;
case 'p': case 'p':
success = listOpFamilyProcedures(pattern, pattern2); success = listOpFamilyFunctions(pattern, pattern2);
break; break;
default: default:
status = PSQL_CMD_UNKNOWN; status = PSQL_CMD_UNKNOWN;
......
...@@ -6310,14 +6310,14 @@ listOpFamilyOperators(const char *access_method_pattern, ...@@ -6310,14 +6310,14 @@ listOpFamilyOperators(const char *access_method_pattern,
/* /*
* \dAp * \dAp
* Lists procedures of operator families * Lists support functions of operator families
* *
* Takes an optional regexps to filter by index access method and operator * Takes an optional regexps to filter by index access method and operator
* family. * family.
*/ */
bool bool
listOpFamilyProcedures(const char *access_method_pattern, listOpFamilyFunctions(const char *access_method_pattern,
const char *family_pattern) const char *family_pattern)
{ {
PQExpBufferData buf; PQExpBufferData buf;
PGresult *res; PGresult *res;
...@@ -6344,7 +6344,7 @@ listOpFamilyProcedures(const char *access_method_pattern, ...@@ -6344,7 +6344,7 @@ listOpFamilyProcedures(const char *access_method_pattern,
gettext_noop("Left arg type"), gettext_noop("Left arg type"),
gettext_noop("Right arg type"), gettext_noop("Right arg type"),
gettext_noop("Number"), gettext_noop("Number"),
gettext_noop("Proc name")); gettext_noop("Function"));
appendPQExpBuffer(&buf, appendPQExpBuffer(&buf,
"FROM pg_catalog.pg_amproc ap\n" "FROM pg_catalog.pg_amproc ap\n"
...@@ -6371,7 +6371,7 @@ listOpFamilyProcedures(const char *access_method_pattern, ...@@ -6371,7 +6371,7 @@ listOpFamilyProcedures(const char *access_method_pattern,
return false; return false;
myopt.nullPrint = NULL; myopt.nullPrint = NULL;
myopt.title = _("List of procedures of operator families"); myopt.title = _("List of support functions of operator families");
myopt.translate_header = true; myopt.translate_header = true;
myopt.translate_columns = translate_columns; myopt.translate_columns = translate_columns;
myopt.n_translate_columns = lengthof(translate_columns); myopt.n_translate_columns = lengthof(translate_columns);
......
...@@ -129,8 +129,8 @@ extern bool listOpFamilyOperators(const char *accessMethod_pattern, ...@@ -129,8 +129,8 @@ extern bool listOpFamilyOperators(const char *accessMethod_pattern,
const char *family_pattern, bool verbose); const char *family_pattern, bool verbose);
/* \dAp */ /* \dAp */
extern bool listOpFamilyProcedures(const char *access_method_pattern, extern bool listOpFamilyFunctions(const char *access_method_pattern,
const char *family_pattern); const char *family_pattern);
#endif /* DESCRIBE_H */ #endif /* DESCRIBE_H */
...@@ -231,7 +231,7 @@ slashUsage(unsigned short int pager) ...@@ -231,7 +231,7 @@ slashUsage(unsigned short int pager)
fprintf(output, _(" \\dAc[+] [AMPTRN [TYPEPTRN]] list operator classes\n")); fprintf(output, _(" \\dAc[+] [AMPTRN [TYPEPTRN]] list operator classes\n"));
fprintf(output, _(" \\dAf[+] [AMPTRN [TYPEPTRN]] list operator families\n")); fprintf(output, _(" \\dAf[+] [AMPTRN [TYPEPTRN]] list operator families\n"));
fprintf(output, _(" \\dAo[+] [AMPTRN [OPFPTRN]] list operators of operator families\n")); fprintf(output, _(" \\dAo[+] [AMPTRN [OPFPTRN]] list operators of operator families\n"));
fprintf(output, _(" \\dAp [AMPTRN [OPFPTRN]] list procedures of operator families\n")); fprintf(output, _(" \\dAp [AMPTRN [OPFPTRN]] list support functions of operator families\n"));
fprintf(output, _(" \\db[+] [PATTERN] list tablespaces\n")); fprintf(output, _(" \\db[+] [PATTERN] list tablespaces\n"));
fprintf(output, _(" \\dc[S+] [PATTERN] list conversions\n")); fprintf(output, _(" \\dc[S+] [PATTERN] list conversions\n"));
fprintf(output, _(" \\dC[+] [PATTERN] list casts\n")); fprintf(output, _(" \\dC[+] [PATTERN] list casts\n"));
......
...@@ -4988,8 +4988,8 @@ List of access methods ...@@ -4988,8 +4988,8 @@ List of access methods
(3 rows) (3 rows)
\dAp btree float_ops \dAp btree float_ops
List of procedures of operator families List of support functions of operator families
AM | Operator family | Left arg type | Right arg type | Number | Proc name AM | Operator family | Left arg type | Right arg type | Number | Function
-------+-----------------+------------------+------------------+--------+--------------------- -------+-----------------+------------------+------------------+--------+---------------------
btree | float_ops | double precision | double precision | 1 | btfloat8cmp btree | float_ops | double precision | double precision | 1 | btfloat8cmp
btree | float_ops | double precision | double precision | 2 | btfloat8sortsupport btree | float_ops | double precision | double precision | 2 | btfloat8sortsupport
...@@ -5002,8 +5002,8 @@ List of access methods ...@@ -5002,8 +5002,8 @@ List of access methods
(8 rows) (8 rows)
\dAp * pg_catalog.uuid_ops \dAp * pg_catalog.uuid_ops
List of procedures of operator families List of support functions of operator families
AM | Operator family | Left arg type | Right arg type | Number | Proc name AM | Operator family | Left arg type | Right arg type | Number | Function
-------+-----------------+---------------+----------------+--------+-------------------- -------+-----------------+---------------+----------------+--------+--------------------
btree | uuid_ops | uuid | uuid | 1 | uuid_cmp btree | uuid_ops | uuid | uuid | 1 | uuid_cmp
btree | uuid_ops | uuid | uuid | 2 | uuid_sortsupport btree | uuid_ops | uuid | uuid | 2 | uuid_sortsupport
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment