diff options
| author | Tom Lane | 2015-05-28 15:24:37 +0000 |
|---|---|---|
| committer | Tom Lane | 2015-05-28 15:24:37 +0000 |
| commit | f3c67aad433484cab9c997a99965992c0ffbdbe5 (patch) | |
| tree | 170c0a13b71857d81009ce2d4c68a1fbfb1d5ca5 | |
| parent | 44674d071f69ed0f9e076bffa9b5386dbede332e (diff) | |
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 998357b154d..166c7ce2408 100644 --- a/src/backend/commands/functioncmds.c +++ b/src/backend/commands/functioncmds.c @@ -1314,11 +1314,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 4df1105e02b..8258463a104 100644 --- a/src/backend/utils/adt/ruleutils.c +++ b/src/backend/utils/adt/ruleutils.c @@ -1769,6 +1769,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 || |