Skip to content

Commit 18b9d22

Browse files
akorotkovakorotkov
committed
Cosmetic improvement for psql opfamily-related information
 * Rename column "Opfamily Name" to "Operator family" for uniformity. * Rename column alias from "t1" to "t".
1 parent 29b6ddd commit 18b9d22

File tree

2 files changed

+32
-32
lines changed

2 files changed

+32
-32
lines changed

‎src/bin/psql/describe.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6102,7 +6102,7 @@ listOperatorClasses(const char *access_method_pattern,
61026102
"\nFROM pg_catalog.pg_opclass c\n"
61036103
" LEFT JOIN pg_catalog.pg_am am on am.oid = c.opcmethod\n"
61046104
" LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.opcnamespace\n"
6105-
" LEFT JOIN pg_catalog.pg_type t1 ON t1.oid = c.opcintype\n"
6105+
" LEFT JOIN pg_catalog.pg_type t ON t.oid = c.opcintype\n"
61066106
);
61076107
if (verbose)
61086108
appendPQExpBuffer(&buf,
@@ -6114,7 +6114,7 @@ listOperatorClasses(const char *access_method_pattern,
61146114
false, false, NULL, "am.amname", NULL, NULL);
61156115
if (type_pattern)
61166116
processSQLNamePattern(pset.db, &buf, type_pattern, have_where, false,
6117-
NULL, "t1.typname", NULL, NULL);
6117+
NULL, "t.typname", NULL, NULL);
61186118

61196119
appendPQExpBufferStr(&buf, "ORDER BY 1, 2, 4;");
61206120
res = PSQLexec(buf.data);
@@ -6250,7 +6250,7 @@ listOpFamilyOperators(const char *access_method_pattern,
62506250
" pg_catalog.format_type(o.amoprighttype, NULL)\n"
62516251
" ) AS \"%s\"\n",
62526252
gettext_noop("AM"),
6253-
gettext_noop("Opfamily Name"),
6253+
gettext_noop("Operator family"),
62546254
gettext_noop("Operator"));
62556255

62566256
if (verbose)

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

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4953,38 +4953,38 @@ List of access methods
49534953
(1 row)
49544954

49554955
\dAo+ btree float_ops
4956-
List of operators of operator families
4957-
AM | Opfamily Name | Operator | Strategy | Purpose | Sort opfamily
4958-
-------+---------------+-----------------------------------------+----------+---------+---------------
4959-
btree | float_ops | < (double precision, double precision) | 1 | search |
4960-
btree | float_ops | <= (double precision, double precision) | 2 | search |
4961-
btree | float_ops | = (double precision, double precision) | 3 | search |
4962-
btree | float_ops | >= (double precision, double precision) | 4 | search |
4963-
btree | float_ops | > (double precision, double precision) | 5 | search |
4964-
btree | float_ops | < (real, real) | 1 | search |
4965-
btree | float_ops | <= (real, real) | 2 | search |
4966-
btree | float_ops | = (real, real) | 3 | search |
4967-
btree | float_ops | >= (real, real) | 4 | search |
4968-
btree | float_ops | > (real, real) | 5 | search |
4969-
btree | float_ops | < (double precision, real) | 1 | search |
4970-
btree | float_ops | <= (double precision, real) | 2 | search |
4971-
btree | float_ops | = (double precision, real) | 3 | search |
4972-
btree | float_ops | >= (double precision, real) | 4 | search |
4973-
btree | float_ops | > (double precision, real) | 5 | search |
4974-
btree | float_ops | < (real, double precision) | 1 | search |
4975-
btree | float_ops | <= (real, double precision) | 2 | search |
4976-
btree | float_ops | = (real, double precision) | 3 | search |
4977-
btree | float_ops | >= (real, double precision) | 4 | search |
4978-
btree | float_ops | > (real, double precision) | 5 | search |
4956+
List of operators of operator families
4957+
AM | Operator family | Operator | Strategy | Purpose | Sort opfamily
4958+
-------+-----------------+-----------------------------------------+----------+---------+---------------
4959+
btree | float_ops | < (double precision, double precision) | 1 | search |
4960+
btree | float_ops | <= (double precision, double precision) | 2 | search |
4961+
btree | float_ops | = (double precision, double precision) | 3 | search |
4962+
btree | float_ops | >= (double precision, double precision) | 4 | search |
4963+
btree | float_ops | > (double precision, double precision) | 5 | search |
4964+
btree | float_ops | < (real, real) | 1 | search |
4965+
btree | float_ops | <= (real, real) | 2 | search |
4966+
btree | float_ops | = (real, real) | 3 | search |
4967+
btree | float_ops | >= (real, real) | 4 | search |
4968+
btree | float_ops | > (real, real) | 5 | search |
4969+
btree | float_ops | < (double precision, real) | 1 | search |
4970+
btree | float_ops | <= (double precision, real) | 2 | search |
4971+
btree | float_ops | = (double precision, real) | 3 | search |
4972+
btree | float_ops | >= (double precision, real) | 4 | search |
4973+
btree | float_ops | > (double precision, real) | 5 | search |
4974+
btree | float_ops | < (real, double precision) | 1 | search |
4975+
btree | float_ops | <= (real, double precision) | 2 | search |
4976+
btree | float_ops | = (real, double precision) | 3 | search |
4977+
btree | float_ops | >= (real, double precision) | 4 | search |
4978+
btree | float_ops | > (real, double precision) | 5 | search |
49794979
(20 rows)
49804980

49814981
\dAo * pg_catalog.jsonb_path_ops
4982-
List of operators of operator families
4983-
AM | Opfamily Name | Operator
4984-
-----+----------------+----------------------
4985-
gin | jsonb_path_ops | @> (jsonb, jsonb)
4986-
gin | jsonb_path_ops | @? (jsonb, jsonpath)
4987-
gin | jsonb_path_ops | @@ (jsonb, jsonpath)
4982+
List of operators of operator families
4983+
AM | Operator family | Operator
4984+
-----+-----------------+----------------------
4985+
gin | jsonb_path_ops | @> (jsonb, jsonb)
4986+
gin | jsonb_path_ops | @? (jsonb, jsonpath)
4987+
gin | jsonb_path_ops | @@ (jsonb, jsonpath)
49884988
(3 rows)
49894989

49904990
\dAp btree float_ops

0 commit comments

Comments
 (0)