Skip to content

Commit 2721712

Browse files
peterepetere
committed
psql: Use more consistent capitalization of some output headings
1 parent 651902d commit 2721712

File tree

6 files changed

+143
-143
lines changed

6 files changed

+143
-143
lines changed

‎contrib/hstore_plperl/expected/create_transform.out

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ DROP FUNCTION plperl_to_hstore(val internal);
4444
CREATE EXTENSION hstore_plperl;
4545
\dx+ hstore_plperl
4646
Objects in extension "hstore_plperl"
47-
Object Description
47+
Object description
4848
--------------------------------------
4949
function hstore_to_plperl(internal)
5050
function plperl_to_hstore(internal)
@@ -54,7 +54,7 @@ CREATE EXTENSION hstore_plperl;
5454
ALTER EXTENSION hstore_plperl DROP TRANSFORM FOR hstore LANGUAGE plperl;
5555
\dx+ hstore_plperl
5656
Objects in extension "hstore_plperl"
57-
Object Description
57+
Object description
5858
-------------------------------------
5959
function hstore_to_plperl(internal)
6060
function plperl_to_hstore(internal)
@@ -63,7 +63,7 @@ Objects in extension "hstore_plperl"
6363
ALTER EXTENSION hstore_plperl ADD TRANSFORM FOR hstore LANGUAGE plperl;
6464
\dx+ hstore_plperl
6565
Objects in extension "hstore_plperl"
66-
Object Description
66+
Object description
6767
--------------------------------------
6868
function hstore_to_plperl(internal)
6969
function plperl_to_hstore(internal)

‎contrib/postgres_fdw/expected/postgres_fdw.out

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ ALTER FOREIGN TABLE ft1 ALTER COLUMN c1 OPTIONS (column_name 'C 1');
181181
ALTER FOREIGN TABLE ft2 ALTER COLUMN c1 OPTIONS (column_name 'C 1');
182182
\det+
183183
List of foreign tables
184-
Schema | Table | Server | FDW Options | Description
184+
Schema | Table | Server | FDW options | Description
185185
--------+------------+-----------+--------------------------------------------------+-------------
186186
public | ft1 | loopback | (schema_name 'S 1', table_name 'T 1') |
187187
public | ft2 | loopback | (schema_name 'S 1', table_name 'T 1') |
@@ -6948,7 +6948,7 @@ CREATE SCHEMA import_dest1;
69486948
IMPORT FOREIGN SCHEMA import_source FROM SERVER loopback INTO import_dest1;
69496949
\det+ import_dest1.*
69506950
List of foreign tables
6951-
Schema | Table | Server | FDW Options | Description
6951+
Schema | Table | Server | FDW options | Description
69526952
--------------+-------+----------+-------------------------------------------------+-------------
69536953
import_dest1 | t1 | loopback | (schema_name 'import_source', table_name 't1') |
69546954
import_dest1 | t2 | loopback | (schema_name 'import_source', table_name 't2') |
@@ -6960,59 +6960,59 @@ IMPORT FOREIGN SCHEMA import_source FROM SERVER loopback INTO import_dest1;
69606960

69616961
\d import_dest1.*
69626962
Foreign table "import_dest1.t1"
6963-
Column | Type | Collation | Nullable | Default | FDW Options
6963+
Column | Type | Collation | Nullable | Default | FDW options
69646964
--------+-------------------+-----------+----------+---------+--------------------
69656965
c1 | integer | | | | (column_name 'c1')
69666966
c2 | character varying | | not null | | (column_name 'c2')
69676967
Server: loopback
6968-
FDW Options: (schema_name 'import_source', table_name 't1')
6968+
FDW options: (schema_name 'import_source', table_name 't1')
69696969

69706970
Foreign table "import_dest1.t2"
6971-
Column | Type | Collation | Nullable | Default | FDW Options
6971+
Column | Type | Collation | Nullable | Default | FDW options
69726972
--------+-------------------+-----------+----------+---------+--------------------
69736973
c1 | integer | | | | (column_name 'c1')
69746974
c2 | character varying | | | | (column_name 'c2')
69756975
c3 | text | POSIX | | | (column_name 'c3')
69766976
Server: loopback
6977-
FDW Options: (schema_name 'import_source', table_name 't2')
6977+
FDW options: (schema_name 'import_source', table_name 't2')
69786978

69796979
Foreign table "import_dest1.t3"
6980-
Column | Type | Collation | Nullable | Default | FDW Options
6980+
Column | Type | Collation | Nullable | Default | FDW options
69816981
--------+--------------------------+-----------+----------+---------+--------------------
69826982
c1 | timestamp with time zone | | | | (column_name 'c1')
69836983
c2 | typ1 | | | | (column_name 'c2')
69846984
Server: loopback
6985-
FDW Options: (schema_name 'import_source', table_name 't3')
6985+
FDW options: (schema_name 'import_source', table_name 't3')
69866986

69876987
Foreign table "import_dest1.t4"
6988-
Column | Type | Collation | Nullable | Default | FDW Options
6988+
Column | Type | Collation | Nullable | Default | FDW options
69896989
--------+---------+-----------+----------+---------+--------------------
69906990
c1 | integer | | | | (column_name 'c1')
69916991
Server: loopback
6992-
FDW Options: (schema_name 'import_source', table_name 't4')
6992+
FDW options: (schema_name 'import_source', table_name 't4')
69936993

69946994
Foreign table "import_dest1.x 4"
6995-
Column | Type | Collation | Nullable | Default | FDW Options
6995+
Column | Type | Collation | Nullable | Default | FDW options
69966996
--------+-----------------------+-----------+----------+---------+---------------------
69976997
c1 | double precision | | | | (column_name 'c1')
69986998
C 2 | text | | | | (column_name 'C 2')
69996999
c3 | character varying(42) | | | | (column_name 'c3')
70007000
Server: loopback
7001-
FDW Options: (schema_name 'import_source', table_name 'x 4')
7001+
FDW options: (schema_name 'import_source', table_name 'x 4')
70027002

70037003
Foreign table "import_dest1.x 5"
7004-
Column | Type | Collation | Nullable | Default | FDW Options
7004+
Column | Type | Collation | Nullable | Default | FDW options
70057005
--------+------+-----------+----------+---------+-------------
70067006
Server: loopback
7007-
FDW Options: (schema_name 'import_source', table_name 'x 5')
7007+
FDW options: (schema_name 'import_source', table_name 'x 5')
70087008

70097009
-- Options
70107010
CREATE SCHEMA import_dest2;
70117011
IMPORT FOREIGN SCHEMA import_source FROM SERVER loopback INTO import_dest2
70127012
OPTIONS (import_default 'true');
70137013
\det+ import_dest2.*
70147014
List of foreign tables
7015-
Schema | Table | Server | FDW Options | Description
7015+
Schema | Table | Server | FDW options | Description
70167016
--------------+-------+----------+-------------------------------------------------+-------------
70177017
import_dest2 | t1 | loopback | (schema_name 'import_source', table_name 't1') |
70187018
import_dest2 | t2 | loopback | (schema_name 'import_source', table_name 't2') |
@@ -7024,58 +7024,58 @@ IMPORT FOREIGN SCHEMA import_source FROM SERVER loopback INTO import_dest2
70247024

70257025
\d import_dest2.*
70267026
Foreign table "import_dest2.t1"
7027-
Column | Type | Collation | Nullable | Default | FDW Options
7027+
Column | Type | Collation | Nullable | Default | FDW options
70287028
--------+-------------------+-----------+----------+---------+--------------------
70297029
c1 | integer | | | | (column_name 'c1')
70307030
c2 | character varying | | not null | | (column_name 'c2')
70317031
Server: loopback
7032-
FDW Options: (schema_name 'import_source', table_name 't1')
7032+
FDW options: (schema_name 'import_source', table_name 't1')
70337033

70347034
Foreign table "import_dest2.t2"
7035-
Column | Type | Collation | Nullable | Default | FDW Options
7035+
Column | Type | Collation | Nullable | Default | FDW options
70367036
--------+-------------------+-----------+----------+---------+--------------------
70377037
c1 | integer | | | 42 | (column_name 'c1')
70387038
c2 | character varying | | | | (column_name 'c2')
70397039
c3 | text | POSIX | | | (column_name 'c3')
70407040
Server: loopback
7041-
FDW Options: (schema_name 'import_source', table_name 't2')
7041+
FDW options: (schema_name 'import_source', table_name 't2')
70427042

70437043
Foreign table "import_dest2.t3"
7044-
Column | Type | Collation | Nullable | Default | FDW Options
7044+
Column | Type | Collation | Nullable | Default | FDW options
70457045
--------+--------------------------+-----------+----------+---------+--------------------
70467046
c1 | timestamp with time zone | | | now() | (column_name 'c1')
70477047
c2 | typ1 | | | | (column_name 'c2')
70487048
Server: loopback
7049-
FDW Options: (schema_name 'import_source', table_name 't3')
7049+
FDW options: (schema_name 'import_source', table_name 't3')
70507050

70517051
Foreign table "import_dest2.t4"
7052-
Column | Type | Collation | Nullable | Default | FDW Options
7052+
Column | Type | Collation | Nullable | Default | FDW options
70537053
--------+---------+-----------+----------+---------+--------------------
70547054
c1 | integer | | | | (column_name 'c1')
70557055
Server: loopback
7056-
FDW Options: (schema_name 'import_source', table_name 't4')
7056+
FDW options: (schema_name 'import_source', table_name 't4')
70577057

70587058
Foreign table "import_dest2.x 4"
7059-
Column | Type | Collation | Nullable | Default | FDW Options
7059+
Column | Type | Collation | Nullable | Default | FDW options
70607060
--------+-----------------------+-----------+----------+---------+---------------------
70617061
c1 | double precision | | | | (column_name 'c1')
70627062
C 2 | text | | | | (column_name 'C 2')
70637063
c3 | character varying(42) | | | | (column_name 'c3')
70647064
Server: loopback
7065-
FDW Options: (schema_name 'import_source', table_name 'x 4')
7065+
FDW options: (schema_name 'import_source', table_name 'x 4')
70667066

70677067
Foreign table "import_dest2.x 5"
7068-
Column | Type | Collation | Nullable | Default | FDW Options
7068+
Column | Type | Collation | Nullable | Default | FDW options
70697069
--------+------+-----------+----------+---------+-------------
70707070
Server: loopback
7071-
FDW Options: (schema_name 'import_source', table_name 'x 5')
7071+
FDW options: (schema_name 'import_source', table_name 'x 5')
70727072

70737073
CREATE SCHEMA import_dest3;
70747074
IMPORT FOREIGN SCHEMA import_source FROM SERVER loopback INTO import_dest3
70757075
OPTIONS (import_collate 'false', import_not_null 'false');
70767076
\det+ import_dest3.*
70777077
List of foreign tables
7078-
Schema | Table | Server | FDW Options | Description
7078+
Schema | Table | Server | FDW options | Description
70797079
--------------+-------+----------+-------------------------------------------------+-------------
70807080
import_dest3 | t1 | loopback | (schema_name 'import_source', table_name 't1') |
70817081
import_dest3 | t2 | loopback | (schema_name 'import_source', table_name 't2') |
@@ -7087,59 +7087,59 @@ IMPORT FOREIGN SCHEMA import_source FROM SERVER loopback INTO import_dest3
70877087

70887088
\d import_dest3.*
70897089
Foreign table "import_dest3.t1"
7090-
Column | Type | Collation | Nullable | Default | FDW Options
7090+
Column | Type | Collation | Nullable | Default | FDW options
70917091
--------+-------------------+-----------+----------+---------+--------------------
70927092
c1 | integer | | | | (column_name 'c1')
70937093
c2 | character varying | | | | (column_name 'c2')
70947094
Server: loopback
7095-
FDW Options: (schema_name 'import_source', table_name 't1')
7095+
FDW options: (schema_name 'import_source', table_name 't1')
70967096

70977097
Foreign table "import_dest3.t2"
7098-
Column | Type | Collation | Nullable | Default | FDW Options
7098+
Column | Type | Collation | Nullable | Default | FDW options
70997099
--------+-------------------+-----------+----------+---------+--------------------
71007100
c1 | integer | | | | (column_name 'c1')
71017101
c2 | character varying | | | | (column_name 'c2')
71027102
c3 | text | | | | (column_name 'c3')
71037103
Server: loopback
7104-
FDW Options: (schema_name 'import_source', table_name 't2')
7104+
FDW options: (schema_name 'import_source', table_name 't2')
71057105

71067106
Foreign table "import_dest3.t3"
7107-
Column | Type | Collation | Nullable | Default | FDW Options
7107+
Column | Type | Collation | Nullable | Default | FDW options
71087108
--------+--------------------------+-----------+----------+---------+--------------------
71097109
c1 | timestamp with time zone | | | | (column_name 'c1')
71107110
c2 | typ1 | | | | (column_name 'c2')
71117111
Server: loopback
7112-
FDW Options: (schema_name 'import_source', table_name 't3')
7112+
FDW options: (schema_name 'import_source', table_name 't3')
71137113

71147114
Foreign table "import_dest3.t4"
7115-
Column | Type | Collation | Nullable | Default | FDW Options
7115+
Column | Type | Collation | Nullable | Default | FDW options
71167116
--------+---------+-----------+----------+---------+--------------------
71177117
c1 | integer | | | | (column_name 'c1')
71187118
Server: loopback
7119-
FDW Options: (schema_name 'import_source', table_name 't4')
7119+
FDW options: (schema_name 'import_source', table_name 't4')
71207120

71217121
Foreign table "import_dest3.x 4"
7122-
Column | Type | Collation | Nullable | Default | FDW Options
7122+
Column | Type | Collation | Nullable | Default | FDW options
71237123
--------+-----------------------+-----------+----------+---------+---------------------
71247124
c1 | double precision | | | | (column_name 'c1')
71257125
C 2 | text | | | | (column_name 'C 2')
71267126
c3 | character varying(42) | | | | (column_name 'c3')
71277127
Server: loopback
7128-
FDW Options: (schema_name 'import_source', table_name 'x 4')
7128+
FDW options: (schema_name 'import_source', table_name 'x 4')
71297129

71307130
Foreign table "import_dest3.x 5"
7131-
Column | Type | Collation | Nullable | Default | FDW Options
7131+
Column | Type | Collation | Nullable | Default | FDW options
71327132
--------+------+-----------+----------+---------+-------------
71337133
Server: loopback
7134-
FDW Options: (schema_name 'import_source', table_name 'x 5')
7134+
FDW options: (schema_name 'import_source', table_name 'x 5')
71357135

71367136
-- Check LIMIT TO and EXCEPT
71377137
CREATE SCHEMA import_dest4;
71387138
IMPORT FOREIGN SCHEMA import_source LIMIT TO (t1, nonesuch)
71397139
FROM SERVER loopback INTO import_dest4;
71407140
\det+ import_dest4.*
71417141
List of foreign tables
7142-
Schema | Table | Server | FDW Options | Description
7142+
Schema | Table | Server | FDW options | Description
71437143
--------------+-------+----------+------------------------------------------------+-------------
71447144
import_dest4 | t1 | loopback | (schema_name 'import_source', table_name 't1') |
71457145
(1 row)
@@ -7148,7 +7148,7 @@ IMPORT FOREIGN SCHEMA import_source EXCEPT (t1, "x 4", nonesuch)
71487148
FROM SERVER loopback INTO import_dest4;
71497149
\det+ import_dest4.*
71507150
List of foreign tables
7151-
Schema | Table | Server | FDW Options | Description
7151+
Schema | Table | Server | FDW options | Description
71527152
--------------+-------+----------+-------------------------------------------------+-------------
71537153
import_dest4 | t1 | loopback | (schema_name 'import_source', table_name 't1') |
71547154
import_dest4 | t2 | loopback | (schema_name 'import_source', table_name 't2') |

‎src/bin/psql/describe.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1726,7 +1726,7 @@ describeOneTableDetails(const char *schemaname,
17261726
headers[cols++] = gettext_noop("Definition");
17271727

17281728
if (tableinfo.relkind == RELKIND_FOREIGN_TABLE && pset.sversion >= 90200)
1729-
headers[cols++] = gettext_noop("FDW Options");
1729+
headers[cols++] = gettext_noop("FDW options");
17301730

17311731
if (verbose)
17321732
{
@@ -2786,7 +2786,7 @@ describeOneTableDetails(const char *schemaname,
27862786
ftoptions = PQgetvalue(result, 0, 1);
27872787
if (ftoptions && ftoptions[0] != '\0')
27882788
{
2789-
printfPQExpBuffer(&buf, _("FDW Options: (%s)"), ftoptions);
2789+
printfPQExpBuffer(&buf, _("FDW options: (%s)"), ftoptions);
27902790
printTableAddFooter(&cont, buf.data);
27912791
}
27922792
PQclear(result);
@@ -3473,12 +3473,12 @@ listLanguages(const char *pattern, bool verbose, bool showSystem)
34733473
",\n NOT l.lanispl AS \"%s\",\n"
34743474
" l.lanplcallfoid::regprocedure AS \"%s\",\n"
34753475
" l.lanvalidator::regprocedure AS \"%s\",\n ",
3476-
gettext_noop("Internal Language"),
3477-
gettext_noop("Call Handler"),
3476+
gettext_noop("Internal language"),
3477+
gettext_noop("Call handler"),
34783478
gettext_noop("Validator"));
34793479
if (pset.sversion >= 90000)
34803480
appendPQExpBuffer(&buf, "l.laninline::regprocedure AS \"%s\",\n ",
3481-
gettext_noop("Inline Handler"));
3481+
gettext_noop("Inline handler"));
34823482
printACLColumn(&buf, "l.lanacl");
34833483
}
34843484

@@ -4612,7 +4612,7 @@ listForeignDataWrappers(const char *pattern, bool verbose)
46124612
" quote_literal(option_value) FROM "
46134613
" pg_options_to_table(fdwoptions)), ', ') || ')' "
46144614
" END AS \"%s\"",
4615-
gettext_noop("FDW Options"));
4615+
gettext_noop("FDW options"));
46164616

46174617
if (pset.sversion >= 90100)
46184618
appendPQExpBuffer(&buf,
@@ -4696,7 +4696,7 @@ listForeignServers(const char *pattern, bool verbose)
46964696
" d.description AS \"%s\"",
46974697
gettext_noop("Type"),
46984698
gettext_noop("Version"),
4699-
gettext_noop("FDW Options"),
4699+
gettext_noop("FDW options"),
47004700
gettext_noop("Description"));
47014701
}
47024702

@@ -4767,7 +4767,7 @@ listUserMappings(const char *pattern, bool verbose)
47674767
" quote_literal(option_value) FROM "
47684768
" pg_options_to_table(umoptions)), ', ') || ')' "
47694769
" END AS \"%s\"",
4770-
gettext_noop("FDW Options"));
4770+
gettext_noop("FDW options"));
47714771

47724772
appendPQExpBufferStr(&buf, "\nFROM pg_catalog.pg_user_mappings um\n");
47734773

@@ -4831,7 +4831,7 @@ listForeignTables(const char *pattern, bool verbose)
48314831
" pg_options_to_table(ftoptions)), ', ') || ')' "
48324832
" END AS \"%s\",\n"
48334833
" d.description AS \"%s\"",
4834-
gettext_noop("FDW Options"),
4834+
gettext_noop("FDW options"),
48354835
gettext_noop("Description"));
48364836

48374837
appendPQExpBufferStr(&buf,
@@ -5017,7 +5017,7 @@ listOneExtensionContents(const char *extname, const char *oid)
50175017
"FROM pg_catalog.pg_depend\n"
50185018
"WHERE refclassid = 'pg_catalog.pg_extension'::pg_catalog.regclass AND refobjid = '%s' AND deptype = 'e'\n"
50195019
"ORDER BY 1;",
5020-
gettext_noop("Object Description"),
5020+
gettext_noop("Object description"),
50215021
oid);
50225022

50235023
res = PSQLexec(buf.data);

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy