Fix pg_get_functiondef() to print a function's LEAKPROOF property.

tglsfdc · tglsfdc · commit d4a9f5519d30 · 2015-05-28T11:24:37.000-04:00
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.
diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c
@@ -1134,11 +1134,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
@@ -1974,6 +1974,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 ||

Original file line number	Diff line number	Diff line change
`@@ -1134,11 +1134,11 @@ AlterFunction(AlterFunctionStmt *stmt)`
`1134`	`1134`	`procForm->prosecdef = intVal(security_def_item->arg);`
`1135`	`1135`	`if (leakproof_item)`
`1136`	`1136`	`{`
`1137`		`- if (intVal(leakproof_item->arg) && !superuser())`
	`1137`	`+ procForm->proleakproof = intVal(leakproof_item->arg);`
	`1138`	`+ if (procForm->proleakproof && !superuser())`
`1138`	`1139`	`ereport(ERROR,`
`1139`	`1140`	`(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),`
`1140`	`1141`	`errmsg("only superuser can define a leakproof function")));`
`1141`		`- procForm->proleakproof = intVal(leakproof_item->arg);`
`1142`	`1142`	`}`
`1143`	`1143`	`if (cost_item)`
`1144`	`1144`	`{`