mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix plperl validator to honor check_function_bodies: when that is OFF,

Browse Source 
we want it to check the argument/result data types and no more.  In
particular, libperl shouldn't get initialized in this case.
This commit is contained in:
Tom Lane 2005-12-28 18:34:16 +00:00
parent 15093bf2d8
commit c104cd2038
1 changed files with 47 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/pl/plperl/plperl.c
View File

@ -33,7 +33,7 @@
* ENHANCEMENTS, OR MODIFICATIONS. * ENHANCEMENTS, OR MODIFICATIONS.
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.96 2005/11/22 18:17:33 momjian Exp $ * $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.97 2005/12/28 18:34:16 tgl Exp $
* *
**********************************************************************/ **********************************************************************/
@ -69,6 +69,8 @@
#define pTHX void #define pTHX void
#endif #endif
extern DLLIMPORT bool check_function_bodies;
/********************************************************************** /**********************************************************************
* The information we cache about loaded procedures * The information we cache about loaded procedures
@ -622,10 +624,13 @@ plperl_validator(PG_FUNCTION_ARGS)
Oid funcoid = PG_GETARG_OID(0); Oid funcoid = PG_GETARG_OID(0);
HeapTuple tuple; HeapTuple tuple;
Form_pg_proc proc; Form_pg_proc proc;
char functyptype;
int numargs;
Oid *argtypes;
char **argnames;
char *argmodes;
bool istrigger = false; bool istrigger = false;
plperl_proc_desc *prodesc; int i;
plperl_init_all();
/* Get the new function's pg_proc entry */ /* Get the new function's pg_proc entry */
tuple = SearchSysCache(PROCOID, tuple = SearchSysCache(PROCOID,
@ -635,14 +640,47 @@ plperl_validator(PG_FUNCTION_ARGS)
elog(ERROR, "cache lookup failed for function %u", funcoid); elog(ERROR, "cache lookup failed for function %u", funcoid);
proc = (Form_pg_proc) GETSTRUCT(tuple); proc = (Form_pg_proc) GETSTRUCT(tuple);
functyptype = get_typtype(proc->prorettype);
/* Disallow pseudotype result */
/* except for TRIGGER, RECORD, or VOID */
if (functyptype == 'p')
{
/* we assume OPAQUE with no arguments means a trigger */ /* we assume OPAQUE with no arguments means a trigger */
if (proc->prorettype == TRIGGEROID || if (proc->prorettype == TRIGGEROID ||
(proc->prorettype == OPAQUEOID && proc->pronargs == 0)) (proc->prorettype == OPAQUEOID && proc->pronargs == 0))
istrigger = true; istrigger = true;
else if (proc->prorettype != RECORDOID &&
proc->prorettype != VOIDOID)
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("plperl functions cannot return type %s",
format_type_be(proc->prorettype))));
}
/* Disallow pseudotypes in arguments (either IN or OUT) */
numargs = get_func_arg_info(tuple,
&argtypes, &argnames, &argmodes);
for (i = 0; i < numargs; i++)
{
if (get_typtype(argtypes[i]) == 'p')
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("plperl functions cannot take type %s",
format_type_be(argtypes[i]))));
}
ReleaseSysCache(tuple); ReleaseSysCache(tuple);
/* Postpone body checks if !check_function_bodies */
if (check_function_bodies)
{
plperl_proc_desc *prodesc;
plperl_init_all();
prodesc = compile_plperl_function(funcoid, istrigger); prodesc = compile_plperl_function(funcoid, istrigger);
}
/* the result of a validator is ignored */ /* the result of a validator is ignored */
PG_RETURN_VOID(); PG_RETURN_VOID();