Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitb6966d4

Browse files
committed
Use DEFACLOBJ_ macros in error message instead of hardcoding
1 parent4e88fe8 commitb6966d4

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

‎src/backend/catalog/objectaddress.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1849,8 +1849,13 @@ get_object_address_defacl(List *object, bool missing_ok)
18491849
default:
18501850
ereport(ERROR,
18511851
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
1852-
errmsg("unrecognized default ACL object type %c",objtype),
1853-
errhint("Valid object types are \"r\", \"S\", \"f\", \"T\" and \"s\".")));
1852+
errmsg("unrecognized default ACL object type \"%c\"",objtype),
1853+
errhint("Valid object types are \"%c\", \"%c\", \"%c\", \"%c\", \"%c\".",
1854+
DEFACLOBJ_RELATION,
1855+
DEFACLOBJ_SEQUENCE,
1856+
DEFACLOBJ_FUNCTION,
1857+
DEFACLOBJ_TYPE,
1858+
DEFACLOBJ_NAMESPACE)));
18541859
}
18551860

18561861
/*

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -274,11 +274,11 @@ WARNING: error for user mapping,{addr_nsp,zwei},{integer}: user mapping for use
274274
WARNING: error for user mapping,{eins,zwei,drei},{}: argument list length must be exactly 1
275275
WARNING: error for user mapping,{eins,zwei,drei},{integer}: user mapping for user "eins" on server "integer" does not exist
276276
WARNING: error for default acl,{eins},{}: argument list length must be exactly 1
277-
WARNING: error for default acl,{eins},{integer}: unrecognized default ACL object typei
277+
WARNING: error for default acl,{eins},{integer}: unrecognized default ACL object type"i"
278278
WARNING: error for default acl,{addr_nsp,zwei},{}: argument list length must be exactly 1
279-
WARNING: error for default acl,{addr_nsp,zwei},{integer}: unrecognized default ACL object typei
279+
WARNING: error for default acl,{addr_nsp,zwei},{integer}: unrecognized default ACL object type"i"
280280
WARNING: error for default acl,{eins,zwei,drei},{}: argument list length must be exactly 1
281-
WARNING: error for default acl,{eins,zwei,drei},{integer}: unrecognized default ACL object typei
281+
WARNING: error for default acl,{eins,zwei,drei},{integer}: unrecognized default ACL object type"i"
282282
WARNING: error for transform,{eins},{}: argument list length must be exactly 1
283283
WARNING: error for transform,{eins},{integer}: type "eins" does not exist
284284
WARNING: error for transform,{addr_nsp,zwei},{}: name list length must be exactly 1

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp