Commit 27217127 authored by Peter Eisentraut's avatar Peter Eisentraut

psql: Use more consistent capitalization of some output headings

parent 651902de
...@@ -44,7 +44,7 @@ DROP FUNCTION plperl_to_hstore(val internal); ...@@ -44,7 +44,7 @@ DROP FUNCTION plperl_to_hstore(val internal);
CREATE EXTENSION hstore_plperl; CREATE EXTENSION hstore_plperl;
\dx+ hstore_plperl \dx+ hstore_plperl
Objects in extension "hstore_plperl" Objects in extension "hstore_plperl"
Object Description Object description
-------------------------------------- --------------------------------------
function hstore_to_plperl(internal) function hstore_to_plperl(internal)
function plperl_to_hstore(internal) function plperl_to_hstore(internal)
...@@ -54,7 +54,7 @@ CREATE EXTENSION hstore_plperl; ...@@ -54,7 +54,7 @@ CREATE EXTENSION hstore_plperl;
ALTER EXTENSION hstore_plperl DROP TRANSFORM FOR hstore LANGUAGE plperl; ALTER EXTENSION hstore_plperl DROP TRANSFORM FOR hstore LANGUAGE plperl;
\dx+ hstore_plperl \dx+ hstore_plperl
Objects in extension "hstore_plperl" Objects in extension "hstore_plperl"
Object Description Object description
------------------------------------- -------------------------------------
function hstore_to_plperl(internal) function hstore_to_plperl(internal)
function plperl_to_hstore(internal) function plperl_to_hstore(internal)
...@@ -63,7 +63,7 @@ Objects in extension "hstore_plperl" ...@@ -63,7 +63,7 @@ Objects in extension "hstore_plperl"
ALTER EXTENSION hstore_plperl ADD TRANSFORM FOR hstore LANGUAGE plperl; ALTER EXTENSION hstore_plperl ADD TRANSFORM FOR hstore LANGUAGE plperl;
\dx+ hstore_plperl \dx+ hstore_plperl
Objects in extension "hstore_plperl" Objects in extension "hstore_plperl"
Object Description Object description
-------------------------------------- --------------------------------------
function hstore_to_plperl(internal) function hstore_to_plperl(internal)
function plperl_to_hstore(internal) function plperl_to_hstore(internal)
......
...@@ -1726,7 +1726,7 @@ describeOneTableDetails(const char *schemaname, ...@@ -1726,7 +1726,7 @@ describeOneTableDetails(const char *schemaname,
headers[cols++] = gettext_noop("Definition"); headers[cols++] = gettext_noop("Definition");
if (tableinfo.relkind == RELKIND_FOREIGN_TABLE && pset.sversion >= 90200) if (tableinfo.relkind == RELKIND_FOREIGN_TABLE && pset.sversion >= 90200)
headers[cols++] = gettext_noop("FDW Options"); headers[cols++] = gettext_noop("FDW options");
if (verbose) if (verbose)
{ {
...@@ -2786,7 +2786,7 @@ describeOneTableDetails(const char *schemaname, ...@@ -2786,7 +2786,7 @@ describeOneTableDetails(const char *schemaname,
ftoptions = PQgetvalue(result, 0, 1); ftoptions = PQgetvalue(result, 0, 1);
if (ftoptions && ftoptions[0] != '\0') if (ftoptions && ftoptions[0] != '\0')
{ {
printfPQExpBuffer(&buf, _("FDW Options: (%s)"), ftoptions); printfPQExpBuffer(&buf, _("FDW options: (%s)"), ftoptions);
printTableAddFooter(&cont, buf.data); printTableAddFooter(&cont, buf.data);
} }
PQclear(result); PQclear(result);
...@@ -3473,12 +3473,12 @@ listLanguages(const char *pattern, bool verbose, bool showSystem) ...@@ -3473,12 +3473,12 @@ listLanguages(const char *pattern, bool verbose, bool showSystem)
",\n NOT l.lanispl AS \"%s\",\n" ",\n NOT l.lanispl AS \"%s\",\n"
" l.lanplcallfoid::regprocedure AS \"%s\",\n" " l.lanplcallfoid::regprocedure AS \"%s\",\n"
" l.lanvalidator::regprocedure AS \"%s\",\n ", " l.lanvalidator::regprocedure AS \"%s\",\n ",
gettext_noop("Internal Language"), gettext_noop("Internal language"),
gettext_noop("Call Handler"), gettext_noop("Call handler"),
gettext_noop("Validator")); gettext_noop("Validator"));
if (pset.sversion >= 90000) if (pset.sversion >= 90000)
appendPQExpBuffer(&buf, "l.laninline::regprocedure AS \"%s\",\n ", appendPQExpBuffer(&buf, "l.laninline::regprocedure AS \"%s\",\n ",
gettext_noop("Inline Handler")); gettext_noop("Inline handler"));
printACLColumn(&buf, "l.lanacl"); printACLColumn(&buf, "l.lanacl");
} }
...@@ -4612,7 +4612,7 @@ listForeignDataWrappers(const char *pattern, bool verbose) ...@@ -4612,7 +4612,7 @@ listForeignDataWrappers(const char *pattern, bool verbose)
" quote_literal(option_value) FROM " " quote_literal(option_value) FROM "
" pg_options_to_table(fdwoptions)), ', ') || ')' " " pg_options_to_table(fdwoptions)), ', ') || ')' "
" END AS \"%s\"", " END AS \"%s\"",
gettext_noop("FDW Options")); gettext_noop("FDW options"));
if (pset.sversion >= 90100) if (pset.sversion >= 90100)
appendPQExpBuffer(&buf, appendPQExpBuffer(&buf,
...@@ -4696,7 +4696,7 @@ listForeignServers(const char *pattern, bool verbose) ...@@ -4696,7 +4696,7 @@ listForeignServers(const char *pattern, bool verbose)
" d.description AS \"%s\"", " d.description AS \"%s\"",
gettext_noop("Type"), gettext_noop("Type"),
gettext_noop("Version"), gettext_noop("Version"),
gettext_noop("FDW Options"), gettext_noop("FDW options"),
gettext_noop("Description")); gettext_noop("Description"));
} }
...@@ -4767,7 +4767,7 @@ listUserMappings(const char *pattern, bool verbose) ...@@ -4767,7 +4767,7 @@ listUserMappings(const char *pattern, bool verbose)
" quote_literal(option_value) FROM " " quote_literal(option_value) FROM "
" pg_options_to_table(umoptions)), ', ') || ')' " " pg_options_to_table(umoptions)), ', ') || ')' "
" END AS \"%s\"", " END AS \"%s\"",
gettext_noop("FDW Options")); gettext_noop("FDW options"));
appendPQExpBufferStr(&buf, "\nFROM pg_catalog.pg_user_mappings um\n"); appendPQExpBufferStr(&buf, "\nFROM pg_catalog.pg_user_mappings um\n");
...@@ -4831,7 +4831,7 @@ listForeignTables(const char *pattern, bool verbose) ...@@ -4831,7 +4831,7 @@ listForeignTables(const char *pattern, bool verbose)
" pg_options_to_table(ftoptions)), ', ') || ')' " " pg_options_to_table(ftoptions)), ', ') || ')' "
" END AS \"%s\",\n" " END AS \"%s\",\n"
" d.description AS \"%s\"", " d.description AS \"%s\"",
gettext_noop("FDW Options"), gettext_noop("FDW options"),
gettext_noop("Description")); gettext_noop("Description"));
appendPQExpBufferStr(&buf, appendPQExpBufferStr(&buf,
...@@ -5017,7 +5017,7 @@ listOneExtensionContents(const char *extname, const char *oid) ...@@ -5017,7 +5017,7 @@ listOneExtensionContents(const char *extname, const char *oid)
"FROM pg_catalog.pg_depend\n" "FROM pg_catalog.pg_depend\n"
"WHERE refclassid = 'pg_catalog.pg_extension'::pg_catalog.regclass AND refobjid = '%s' AND deptype = 'e'\n" "WHERE refclassid = 'pg_catalog.pg_extension'::pg_catalog.regclass AND refobjid = '%s' AND deptype = 'e'\n"
"ORDER BY 1;", "ORDER BY 1;",
gettext_noop("Object Description"), gettext_noop("Object description"),
oid); oid);
res = PSQLexec(buf.data); res = PSQLexec(buf.data);
......
...@@ -44,7 +44,7 @@ create table old_table1 (col1 serial primary key); ...@@ -44,7 +44,7 @@ create table old_table1 (col1 serial primary key);
create extension test_ext7; create extension test_ext7;
\dx+ test_ext7 \dx+ test_ext7
Objects in extension "test_ext7" Objects in extension "test_ext7"
Object Description Object description
------------------------------- -------------------------------
sequence ext7_table1_col1_seq sequence ext7_table1_col1_seq
sequence ext7_table2_col2_seq sequence ext7_table2_col2_seq
...@@ -57,7 +57,7 @@ Objects in extension "test_ext7" ...@@ -57,7 +57,7 @@ Objects in extension "test_ext7"
alter extension test_ext7 update to '2.0'; alter extension test_ext7 update to '2.0';
\dx+ test_ext7 \dx+ test_ext7
Objects in extension "test_ext7" Objects in extension "test_ext7"
Object Description Object description
------------------------------- -------------------------------
sequence ext7_table2_col2_seq sequence ext7_table2_col2_seq
table ext7_table2 table ext7_table2
...@@ -67,12 +67,12 @@ Objects in extension "test_ext7" ...@@ -67,12 +67,12 @@ Objects in extension "test_ext7"
create extension test_ext8; create extension test_ext8;
-- \dx+ would expose a variable pg_temp_nn schema name, so we can't use it here -- \dx+ would expose a variable pg_temp_nn schema name, so we can't use it here
select regexp_replace(pg_describe_object(classid, objid, objsubid), select regexp_replace(pg_describe_object(classid, objid, objsubid),
'pg_temp_\d+', 'pg_temp', 'g') as "Object Description" 'pg_temp_\d+', 'pg_temp', 'g') as "Object description"
from pg_depend from pg_depend
where refclassid = 'pg_extension'::regclass and deptype = 'e' and where refclassid = 'pg_extension'::regclass and deptype = 'e' and
refobjid = (select oid from pg_extension where extname = 'test_ext8') refobjid = (select oid from pg_extension where extname = 'test_ext8')
order by 1; order by 1;
Object Description Object description
----------------------------------------- -----------------------------------------
function ext8_even(posint) function ext8_even(posint)
function pg_temp.ext8_temp_even(posint) function pg_temp.ext8_temp_even(posint)
...@@ -85,12 +85,12 @@ order by 1; ...@@ -85,12 +85,12 @@ order by 1;
drop extension test_ext8; drop extension test_ext8;
create extension test_ext8; create extension test_ext8;
select regexp_replace(pg_describe_object(classid, objid, objsubid), select regexp_replace(pg_describe_object(classid, objid, objsubid),
'pg_temp_\d+', 'pg_temp', 'g') as "Object Description" 'pg_temp_\d+', 'pg_temp', 'g') as "Object description"
from pg_depend from pg_depend
where refclassid = 'pg_extension'::regclass and deptype = 'e' and where refclassid = 'pg_extension'::regclass and deptype = 'e' and
refobjid = (select oid from pg_extension where extname = 'test_ext8') refobjid = (select oid from pg_extension where extname = 'test_ext8')
order by 1; order by 1;
Object Description Object description
----------------------------------------- -----------------------------------------
function ext8_even(posint) function ext8_even(posint)
function pg_temp.ext8_temp_even(posint) function pg_temp.ext8_temp_even(posint)
...@@ -112,7 +112,7 @@ end'; ...@@ -112,7 +112,7 @@ end';
-- extension should now contain no temp objects -- extension should now contain no temp objects
\dx+ test_ext8 \dx+ test_ext8
Objects in extension "test_ext8" Objects in extension "test_ext8"
Object Description Object description
---------------------------- ----------------------------
function ext8_even(posint) function ext8_even(posint)
table ext8_table1 table ext8_table1
......
...@@ -31,7 +31,7 @@ create extension test_ext8; ...@@ -31,7 +31,7 @@ create extension test_ext8;
-- \dx+ would expose a variable pg_temp_nn schema name, so we can't use it here -- \dx+ would expose a variable pg_temp_nn schema name, so we can't use it here
select regexp_replace(pg_describe_object(classid, objid, objsubid), select regexp_replace(pg_describe_object(classid, objid, objsubid),
'pg_temp_\d+', 'pg_temp', 'g') as "Object Description" 'pg_temp_\d+', 'pg_temp', 'g') as "Object description"
from pg_depend from pg_depend
where refclassid = 'pg_extension'::regclass and deptype = 'e' and where refclassid = 'pg_extension'::regclass and deptype = 'e' and
refobjid = (select oid from pg_extension where extname = 'test_ext8') refobjid = (select oid from pg_extension where extname = 'test_ext8')
...@@ -42,7 +42,7 @@ drop extension test_ext8; ...@@ -42,7 +42,7 @@ drop extension test_ext8;
create extension test_ext8; create extension test_ext8;
select regexp_replace(pg_describe_object(classid, objid, objsubid), select regexp_replace(pg_describe_object(classid, objid, objsubid),
'pg_temp_\d+', 'pg_temp', 'g') as "Object Description" 'pg_temp_\d+', 'pg_temp', 'g') as "Object description"
from pg_depend from pg_depend
where refclassid = 'pg_extension'::regclass and deptype = 'e' and where refclassid = 'pg_extension'::regclass and deptype = 'e' and
refobjid = (select oid from pg_extension where extname = 'test_ext8') refobjid = (select oid from pg_extension where extname = 'test_ext8')
......
This diff is collapsed.
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