diff options
| author | Alexander Korotkov <akorotkov@postgresql.org> | 2020-05-17 13:02:16 +0300 |
|---|---|---|
| committer | Alexander Korotkov <akorotkov@postgresql.org> | 2020-05-17 13:05:11 +0300 |
| commit | 18b9d22cef988c4a67d440f6cafc160d9c05871b (patch) | |
| tree | 22e90a276c33856feb322b0ee01dec3fd7ef2593 | |
| parent | 29b6ddd38d0914340c3c4bb4bb4bd5c4a3c02dca (diff) | |
| download | postgresql-18b9d22cef988c4a67d440f6cafc160d9c05871b.tar.gz postgresql-18b9d22cef988c4a67d440f6cafc160d9c05871b.zip | |
Cosmetic improvement for psql opfamily-related information
* Rename column "Opfamily Name" to "Operator family" for uniformity.
* Rename column alias from "t1" to "t".
| -rw-r--r-- | src/bin/psql/describe.c | 6 | ||||
| -rw-r--r-- | src/test/regress/expected/psql.out | 58 |
2 files changed, 32 insertions, 32 deletions
diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c index dd396e50fcd..c7639f62062 100644 --- a/src/bin/psql/describe.c +++ b/src/bin/psql/describe.c @@ -6102,7 +6102,7 @@ listOperatorClasses(const char *access_method_pattern, "\nFROM pg_catalog.pg_opclass c\n" " LEFT JOIN pg_catalog.pg_am am on am.oid = c.opcmethod\n" " LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.opcnamespace\n" - " LEFT JOIN pg_catalog.pg_type t1 ON t1.oid = c.opcintype\n" + " LEFT JOIN pg_catalog.pg_type t ON t.oid = c.opcintype\n" ); if (verbose) appendPQExpBuffer(&buf, @@ -6114,7 +6114,7 @@ listOperatorClasses(const char *access_method_pattern, false, false, NULL, "am.amname", NULL, NULL); if (type_pattern) processSQLNamePattern(pset.db, &buf, type_pattern, have_where, false, - NULL, "t1.typname", NULL, NULL); + NULL, "t.typname", NULL, NULL); appendPQExpBufferStr(&buf, "ORDER BY 1, 2, 4;"); res = PSQLexec(buf.data); @@ -6250,7 +6250,7 @@ listOpFamilyOperators(const char *access_method_pattern, " pg_catalog.format_type(o.amoprighttype, NULL)\n" " ) AS \"%s\"\n", gettext_noop("AM"), - gettext_noop("Opfamily Name"), + gettext_noop("Operator family"), gettext_noop("Operator")); if (verbose) diff --git a/src/test/regress/expected/psql.out b/src/test/regress/expected/psql.out index 6e6fcb2db64..ca6b1531cdf 100644 --- a/src/test/regress/expected/psql.out +++ b/src/test/regress/expected/psql.out @@ -4953,38 +4953,38 @@ List of access methods (1 row) \dAo+ btree float_ops - List of operators of operator families - AM | Opfamily Name | Operator | Strategy | Purpose | Sort opfamily --------+---------------+-----------------------------------------+----------+---------+--------------- - btree | float_ops | < (double precision, double precision) | 1 | search | - btree | float_ops | <= (double precision, double precision) | 2 | search | - btree | float_ops | = (double precision, double precision) | 3 | search | - btree | float_ops | >= (double precision, double precision) | 4 | search | - btree | float_ops | > (double precision, double precision) | 5 | search | - btree | float_ops | < (real, real) | 1 | search | - btree | float_ops | <= (real, real) | 2 | search | - btree | float_ops | = (real, real) | 3 | search | - btree | float_ops | >= (real, real) | 4 | search | - btree | float_ops | > (real, real) | 5 | search | - btree | float_ops | < (double precision, real) | 1 | search | - btree | float_ops | <= (double precision, real) | 2 | search | - btree | float_ops | = (double precision, real) | 3 | search | - btree | float_ops | >= (double precision, real) | 4 | search | - btree | float_ops | > (double precision, real) | 5 | search | - btree | float_ops | < (real, double precision) | 1 | search | - btree | float_ops | <= (real, double precision) | 2 | search | - btree | float_ops | = (real, double precision) | 3 | search | - btree | float_ops | >= (real, double precision) | 4 | search | - btree | float_ops | > (real, double precision) | 5 | search | + List of operators of operator families + AM | Operator family | Operator | Strategy | Purpose | Sort opfamily +-------+-----------------+-----------------------------------------+----------+---------+--------------- + btree | float_ops | < (double precision, double precision) | 1 | search | + btree | float_ops | <= (double precision, double precision) | 2 | search | + btree | float_ops | = (double precision, double precision) | 3 | search | + btree | float_ops | >= (double precision, double precision) | 4 | search | + btree | float_ops | > (double precision, double precision) | 5 | search | + btree | float_ops | < (real, real) | 1 | search | + btree | float_ops | <= (real, real) | 2 | search | + btree | float_ops | = (real, real) | 3 | search | + btree | float_ops | >= (real, real) | 4 | search | + btree | float_ops | > (real, real) | 5 | search | + btree | float_ops | < (double precision, real) | 1 | search | + btree | float_ops | <= (double precision, real) | 2 | search | + btree | float_ops | = (double precision, real) | 3 | search | + btree | float_ops | >= (double precision, real) | 4 | search | + btree | float_ops | > (double precision, real) | 5 | search | + btree | float_ops | < (real, double precision) | 1 | search | + btree | float_ops | <= (real, double precision) | 2 | search | + btree | float_ops | = (real, double precision) | 3 | search | + btree | float_ops | >= (real, double precision) | 4 | search | + btree | float_ops | > (real, double precision) | 5 | search | (20 rows) \dAo * pg_catalog.jsonb_path_ops - List of operators of operator families - AM | Opfamily Name | Operator ------+----------------+---------------------- - gin | jsonb_path_ops | @> (jsonb, jsonb) - gin | jsonb_path_ops | @? (jsonb, jsonpath) - gin | jsonb_path_ops | @@ (jsonb, jsonpath) + List of operators of operator families + AM | Operator family | Operator +-----+-----------------+---------------------- + gin | jsonb_path_ops | @> (jsonb, jsonb) + gin | jsonb_path_ops | @? (jsonb, jsonpath) + gin | jsonb_path_ops | @@ (jsonb, jsonpath) (3 rows) \dAp btree float_ops |