diff options
| author | Peter Eisentraut | 2017-06-14 18:44:24 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2017-06-14 18:44:24 +0000 |
| commit | b6966d4627c0297ad42fe2592c66ac2f76e9962e (patch) | |
| tree | 8f196124c45268f6e68dda096df47f836d9ecc37 | |
| parent | 4e88fe8f8f148a45feacb50c2eaed9ca9ddea8bb (diff) | |
Use DEFACLOBJ_ macros in error message instead of hardcoding
| -rw-r--r-- | src/backend/catalog/objectaddress.c | 9 | ||||
| -rw-r--r-- | src/test/regress/expected/object_address.out | 6 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index be16cf66f4..2b15d1979e 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -1849,8 +1849,13 @@ get_object_address_defacl(List *object, bool missing_ok) default: ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("unrecognized default ACL object type %c", objtype), - errhint("Valid object types are \"r\", \"S\", \"f\", \"T\" and \"s\"."))); + errmsg("unrecognized default ACL object type \"%c\"", objtype), + errhint("Valid object types are \"%c\", \"%c\", \"%c\", \"%c\", \"%c\".", + DEFACLOBJ_RELATION, + DEFACLOBJ_SEQUENCE, + DEFACLOBJ_FUNCTION, + DEFACLOBJ_TYPE, + DEFACLOBJ_NAMESPACE))); } /* diff --git a/src/test/regress/expected/object_address.out b/src/test/regress/expected/object_address.out index 8c56512007..3f23a48972 100644 --- a/src/test/regress/expected/object_address.out +++ b/src/test/regress/expected/object_address.out @@ -274,11 +274,11 @@ WARNING: error for user mapping,{addr_nsp,zwei},{integer}: user mapping for use WARNING: error for user mapping,{eins,zwei,drei},{}: argument list length must be exactly 1 WARNING: error for user mapping,{eins,zwei,drei},{integer}: user mapping for user "eins" on server "integer" does not exist WARNING: error for default acl,{eins},{}: argument list length must be exactly 1 -WARNING: error for default acl,{eins},{integer}: unrecognized default ACL object type i +WARNING: error for default acl,{eins},{integer}: unrecognized default ACL object type "i" WARNING: error for default acl,{addr_nsp,zwei},{}: argument list length must be exactly 1 -WARNING: error for default acl,{addr_nsp,zwei},{integer}: unrecognized default ACL object type i +WARNING: error for default acl,{addr_nsp,zwei},{integer}: unrecognized default ACL object type "i" WARNING: error for default acl,{eins,zwei,drei},{}: argument list length must be exactly 1 -WARNING: error for default acl,{eins,zwei,drei},{integer}: unrecognized default ACL object type i +WARNING: error for default acl,{eins,zwei,drei},{integer}: unrecognized default ACL object type "i" WARNING: error for transform,{eins},{}: argument list length must be exactly 1 WARNING: error for transform,{eins},{integer}: type "eins" does not exist WARNING: error for transform,{addr_nsp,zwei},{}: name list length must be exactly 1 |