diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2015-05-28 11:24:37 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2015-05-28 11:24:37 -0400 |
| commit | 27bae8d964f7eeb61e7e6e57586e7cb9b571b94c (patch) | |
| tree | a0c98a8ad8b3bbcb675d4464cc89ed023f22a93d | |
| parent | 5c8e43a492c9885ea5d541b8d0d391a871ad8427 (diff) | |
| download | postgresql-27bae8d964f7eeb61e7e6e57586e7cb9b571b94c.tar.gz postgresql-27bae8d964f7eeb61e7e6e57586e7cb9b571b94c.zip | |
Fix pg_get_functiondef() to print a function's LEAKPROOF property.
Seems to have been an oversight in the original leakproofness patch.
Per report and patch from Jeevan Chalke.
In passing, prettify some awkward leakproof-related code in AlterFunction.
| -rw-r--r-- | src/backend/commands/functioncmds.c | 4 | ||||
| -rw-r--r-- | src/backend/utils/adt/ruleutils.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c index eef78498ba6..5915cd7acb3 100644 --- a/src/backend/commands/functioncmds.c +++ b/src/backend/commands/functioncmds.c @@ -1103,11 +1103,11 @@ AlterFunction(AlterFunctionStmt *stmt) procForm->prosecdef = intVal(security_def_item->arg); if (leakproof_item) { - if (intVal(leakproof_item->arg) && !superuser()) + procForm->proleakproof = intVal(leakproof_item->arg); + if (procForm->proleakproof && !superuser()) ereport(ERROR, (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), errmsg("only superuser can define a leakproof function"))); - procForm->proleakproof = intVal(leakproof_item->arg); } if (cost_item) { diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c index 578972bba25..da28e59a921 100644 --- a/src/backend/utils/adt/ruleutils.c +++ b/src/backend/utils/adt/ruleutils.c @@ -1944,6 +1944,8 @@ pg_get_functiondef(PG_FUNCTION_ARGS) appendStringInfoString(&buf, " STRICT"); if (proc->prosecdef) appendStringInfoString(&buf, " SECURITY DEFINER"); + if (proc->proleakproof) + appendStringInfoString(&buf, " LEAKPROOF"); /* This code for the default cost and rows should match functioncmds.c */ if (proc->prolang == INTERNALlanguageId || |