Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit f506704

Browse filesBrowse files
peterepetere
committed
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.
1 parent 3fa44a3 commit f506704
Copy full SHA for f506704

File tree

Expand file treeCollapse file tree

6 files changed

+14
-14
lines changed
Filter options
Expand file treeCollapse file tree

6 files changed

+14
-14
lines changed

‎doc/src/sgml/ref/psql-ref.sgml

Copy file name to clipboardExpand all lines: doc/src/sgml/ref/psql-ref.sgml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1309,7 +1309,7 @@ testdb=>
13091309
</term>
13101310
<listitem>
13111311
<para>
1312-
Lists procedures associated with operator families
1312+
Lists functions associated with operator families
13131313
(<xref linkend="catalog-pg-amproc"/>).
13141314
If <replaceable class="parameter">access-method-pattern</replaceable>
13151315
is specified, only members of operator families associated with access

‎src/bin/psql/command.c

Copy file name to clipboardExpand all lines: src/bin/psql/command.c
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -747,7 +747,7 @@ exec_command_d(PsqlScanState scan_state, bool active_branch, const char *cmd)
747747
success = listOpFamilyOperators(pattern, pattern2, show_verbose);
748748
break;
749749
case 'p':
750-
success = listOpFamilyProcedures(pattern, pattern2);
750+
success = listOpFamilyFunctions(pattern, pattern2);
751751
break;
752752
default:
753753
status = PSQL_CMD_UNKNOWN;

‎src/bin/psql/describe.c

Copy file name to clipboardExpand all lines: src/bin/psql/describe.c
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6310,14 +6310,14 @@ listOpFamilyOperators(const char *access_method_pattern,
63106310

63116311
/*
63126312
* \dAp
6313-
* Lists procedures of operator families
6313+
* Lists support functions of operator families
63146314
*
63156315
* Takes an optional regexps to filter by index access method and operator
63166316
* family.
63176317
*/
63186318
bool
6319-
listOpFamilyProcedures(const char *access_method_pattern,
6320-
const char *family_pattern)
6319+
listOpFamilyFunctions(const char *access_method_pattern,
6320+
const char *family_pattern)
63216321
{
63226322
PQExpBufferData buf;
63236323
PGresult *res;
@@ -6344,7 +6344,7 @@ listOpFamilyProcedures(const char *access_method_pattern,
63446344
gettext_noop("Left arg type"),
63456345
gettext_noop("Right arg type"),
63466346
gettext_noop("Number"),
6347-
gettext_noop("Proc name"));
6347+
gettext_noop("Function"));
63486348

63496349
appendPQExpBuffer(&buf,
63506350
"FROM pg_catalog.pg_amproc ap\n"
@@ -6371,7 +6371,7 @@ listOpFamilyProcedures(const char *access_method_pattern,
63716371
return false;
63726372

63736373
myopt.nullPrint = NULL;
6374-
myopt.title = _("List of procedures of operator families");
6374+
myopt.title = _("List of support functions of operator families");
63756375
myopt.translate_header = true;
63766376
myopt.translate_columns = translate_columns;
63776377
myopt.n_translate_columns = lengthof(translate_columns);

‎src/bin/psql/describe.h

Copy file name to clipboardExpand all lines: src/bin/psql/describe.h
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ extern bool listOpFamilyOperators(const char *accessMethod_pattern,
129129
const char *family_pattern, bool verbose);
130130

131131
/* \dAp */
132-
extern bool listOpFamilyProcedures(const char *access_method_pattern,
133-
const char *family_pattern);
132+
extern bool listOpFamilyFunctions(const char *access_method_pattern,
133+
const char *family_pattern);
134134

135135

136136
#endif /* DESCRIBE_H */

‎src/bin/psql/help.c

Copy file name to clipboardExpand all lines: src/bin/psql/help.c
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ slashUsage(unsigned short int pager)
231231
fprintf(output, _(" \\dAc[+] [AMPTRN [TYPEPTRN]] list operator classes\n"));
232232
fprintf(output, _(" \\dAf[+] [AMPTRN [TYPEPTRN]] list operator families\n"));
233233
fprintf(output, _(" \\dAo[+] [AMPTRN [OPFPTRN]] list operators of operator families\n"));
234-
fprintf(output, _(" \\dAp [AMPTRN [OPFPTRN]] list procedures of operator families\n"));
234+
fprintf(output, _(" \\dAp [AMPTRN [OPFPTRN]] list support functions of operator families\n"));
235235
fprintf(output, _(" \\db[+] [PATTERN] list tablespaces\n"));
236236
fprintf(output, _(" \\dc[S+] [PATTERN] list conversions\n"));
237237
fprintf(output, _(" \\dC[+] [PATTERN] list casts\n"));

‎src/test/regress/expected/psql.out

Copy file name to clipboardExpand all lines: src/test/regress/expected/psql.out
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4988,8 +4988,8 @@ List of access methods
49884988
(3 rows)
49894989

49904990
\dAp btree float_ops
4991-
List of procedures of operator families
4992-
AM | Operator family | Left arg type | Right arg type | Number | Proc name
4991+
List of support functions of operator families
4992+
AM | Operator family | Left arg type | Right arg type | Number | Function
49934993
-------+-----------------+------------------+------------------+--------+---------------------
49944994
btree | float_ops | double precision | double precision | 1 | btfloat8cmp
49954995
btree | float_ops | double precision | double precision | 2 | btfloat8sortsupport
@@ -5002,8 +5002,8 @@ List of access methods
50025002
(8 rows)
50035003

50045004
\dAp * pg_catalog.uuid_ops
5005-
List of procedures of operator families
5006-
AM | Operator family | Left arg type | Right arg type | Number | Proc name
5005+
List of support functions of operator families
5006+
AM | Operator family | Left arg type | Right arg type | Number | Function
50075007
-------+-----------------+---------------+----------------+--------+--------------------
50085008
btree | uuid_ops | uuid | uuid | 1 | uuid_cmp
50095009
btree | uuid_ops | uuid | uuid | 2 | uuid_sortsupport

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.