diff options
| author | Daniel Gustafsson <dgustafsson@postgresql.org> | 2023-03-25 22:49:33 +0100 |
|---|---|---|
| committer | Daniel Gustafsson <dgustafsson@postgresql.org> | 2023-03-25 22:49:33 +0100 |
| commit | d435f15fff3cf3cf5d6cfcfd63e21acc0f737829 (patch) | |
| tree | 9be0836e44c3b6809bf2f6910e9fd4a45ef1f217 /src/backend/parser/parse_func.c | |
| parent | e33967b13bbc6e4e1c1b5e9ecd1c45148cffcc53 (diff) | |
| download | postgresql-d435f15fff3cf3cf5d6cfcfd63e21acc0f737829.tar.gz postgresql-d435f15fff3cf3cf5d6cfcfd63e21acc0f737829.zip | |
Add SysCacheGetAttrNotNull for guaranteed not-null attrs
When extracting an attr from a cached tuple in the syscache with
SysCacheGetAttr the isnull parameter must be checked in case the
attr cannot be NULL. For cases when this is known beforehand, a
wrapper is introduced which perform the errorhandling internally
on behalf of the caller, invoking an elog in case of a NULL attr.
Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us>
Reviewed-by: Peter Eisentraut <peter.eisentraut@enterprisedb.com>
Reviewed-by: David Rowley <dgrowleyml@gmail.com>
Discussion: https://postgr.es/m/AD76405E-DB45-46B6-941F-17B1EB3A9076@yesql.se
Diffstat (limited to 'src/backend/parser/parse_func.c')
| -rw-r--r-- | src/backend/parser/parse_func.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c index ca14f063086..b3f0b6a137a 100644 --- a/src/backend/parser/parse_func.c +++ b/src/backend/parser/parse_func.c @@ -1632,7 +1632,6 @@ func_get_detail(List *funcname, if (argdefaults && best_candidate->ndargs > 0) { Datum proargdefaults; - bool isnull; char *str; List *defaults; @@ -1640,10 +1639,8 @@ func_get_detail(List *funcname, if (best_candidate->ndargs > pform->pronargdefaults) elog(ERROR, "not enough default arguments"); - proargdefaults = SysCacheGetAttr(PROCOID, ftup, - Anum_pg_proc_proargdefaults, - &isnull); - Assert(!isnull); + proargdefaults = SysCacheGetAttrNotNull(PROCOID, ftup, + Anum_pg_proc_proargdefaults); str = TextDatumGetCString(proargdefaults); defaults = castNode(List, stringToNode(str)); pfree(str); |