mirror of
https://github.com/postgres/postgres.git
synced 2025-07-05 07:21:24 +03:00
Replace AclObjectKind with ObjectType
AclObjectKind was basically just another enumeration for object types, and we already have a preferred one for that. It's only used in aclcheck_error. By using ObjectType instead, we can also give some more precise error messages, for example "index" instead of "relation". Reviewed-by: Michael Paquier <michael.paquier@gmail.com>
This commit is contained in:
@ -2548,7 +2548,7 @@ ExecInitAgg(Agg *node, EState *estate, int eflags)
|
||||
aclresult = pg_proc_aclcheck(aggref->aggfnoid, GetUserId(),
|
||||
ACL_EXECUTE);
|
||||
if (aclresult != ACLCHECK_OK)
|
||||
aclcheck_error(aclresult, ACL_KIND_PROC,
|
||||
aclcheck_error(aclresult, OBJECT_AGGREGATE,
|
||||
get_func_name(aggref->aggfnoid));
|
||||
InvokeFunctionExecuteHook(aggref->aggfnoid);
|
||||
|
||||
@ -2638,7 +2638,7 @@ ExecInitAgg(Agg *node, EState *estate, int eflags)
|
||||
aclresult = pg_proc_aclcheck(transfn_oid, aggOwner,
|
||||
ACL_EXECUTE);
|
||||
if (aclresult != ACLCHECK_OK)
|
||||
aclcheck_error(aclresult, ACL_KIND_PROC,
|
||||
aclcheck_error(aclresult, OBJECT_FUNCTION,
|
||||
get_func_name(transfn_oid));
|
||||
InvokeFunctionExecuteHook(transfn_oid);
|
||||
if (OidIsValid(finalfn_oid))
|
||||
@ -2646,7 +2646,7 @@ ExecInitAgg(Agg *node, EState *estate, int eflags)
|
||||
aclresult = pg_proc_aclcheck(finalfn_oid, aggOwner,
|
||||
ACL_EXECUTE);
|
||||
if (aclresult != ACLCHECK_OK)
|
||||
aclcheck_error(aclresult, ACL_KIND_PROC,
|
||||
aclcheck_error(aclresult, OBJECT_FUNCTION,
|
||||
get_func_name(finalfn_oid));
|
||||
InvokeFunctionExecuteHook(finalfn_oid);
|
||||
}
|
||||
@ -2655,7 +2655,7 @@ ExecInitAgg(Agg *node, EState *estate, int eflags)
|
||||
aclresult = pg_proc_aclcheck(serialfn_oid, aggOwner,
|
||||
ACL_EXECUTE);
|
||||
if (aclresult != ACLCHECK_OK)
|
||||
aclcheck_error(aclresult, ACL_KIND_PROC,
|
||||
aclcheck_error(aclresult, OBJECT_FUNCTION,
|
||||
get_func_name(serialfn_oid));
|
||||
InvokeFunctionExecuteHook(serialfn_oid);
|
||||
}
|
||||
@ -2664,7 +2664,7 @@ ExecInitAgg(Agg *node, EState *estate, int eflags)
|
||||
aclresult = pg_proc_aclcheck(deserialfn_oid, aggOwner,
|
||||
ACL_EXECUTE);
|
||||
if (aclresult != ACLCHECK_OK)
|
||||
aclcheck_error(aclresult, ACL_KIND_PROC,
|
||||
aclcheck_error(aclresult, OBJECT_FUNCTION,
|
||||
get_func_name(deserialfn_oid));
|
||||
InvokeFunctionExecuteHook(deserialfn_oid);
|
||||
}
|
||||
|
Reference in New Issue
Block a user