database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

Improve English wording of some other getObjectDescription() messages.

Browse Source 
Print columns as "column C of <relation>" rather than "<relation> column
C".  This seems to read noticeably better in English, as evidenced by the
regression test output changes, and the code change also makes it possible
for translators to adjust the phrase order in other languages.

Also change the output for OCLASS_DEFAULT from "default for %s" to
"default value for %s".  This seems to read better and is also more
consistent with the output of, for instance, getObjectTypeDescription().

Kyotaro Horiguchi, per a complaint from me

Discussion: https://postgr.es/m/20180522.182020.114074746.horiguchi.kyotaro@lab.ntt.co.jp
This commit is contained in:
Tom Lane
2018-05-24 14:01:10 -04:00
parent 7c89eb750d
commit b86b7bfa3e
8 changed files with 36 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/earthdistance/expected/earthdistance.out
View File

@ -985,7 +985,7 @@ HINT: You can drop extension cube instead.
create table foo (f1 cube, f2 int);
drop extension cube; -- fail, foo.f1 requires it
ERROR: cannot drop extension cube because other objects depend on it
DETAIL: table foo column f1 depends on type cube
DETAIL: column f1 of table foo depends on type cube
HINT: Use DROP ... CASCADE to drop the dependent objects too.
drop table foo;
drop extension cube;
@ -1039,15 +1039,15 @@ create extension cube with schema c;
create table foo (f1 c.cube, f2 int);
drop extension cube; -- fail, foo.f1 requires it
ERROR: cannot drop extension cube because other objects depend on it
DETAIL: table foo column f1 depends on type c.cube
DETAIL: column f1 of table foo depends on type c.cube
HINT: Use DROP ... CASCADE to drop the dependent objects too.
drop schema c; -- fail, cube requires it
ERROR: cannot drop schema c because other objects depend on it
DETAIL: extension cube depends on schema c
table foo column f1 depends on type c.cube
column f1 of table foo depends on type c.cube
HINT: Use DROP ... CASCADE to drop the dependent objects too.
drop extension cube cascade;
NOTICE: drop cascades to table foo column f1
NOTICE: drop cascades to column f1 of table foo
\d foo
Table "public.foo"
Column | Type | Collation | Nullable | Default