mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-09 08:10:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Set per-function GUC settings during validating the function.

Browse Source 
Now validators work properly even when the settings contain
parameters that affect behavior of the function, like search_path.

Reported by Erwin Brandstetter.
This commit is contained in:
Itagaki Takahiro 2010-05-11 04:57:51 +00:00
parent db01ccc052
commit ba7b77133e
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/backend/catalog/pg_proc.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/catalog/pg_proc.c,v 1.148.2.1 2009/10/02 18:13:19 tgl Exp $ * $PostgreSQL: pgsql/src/backend/catalog/pg_proc.c,v 1.148.2.2 2010/05/11 04:57:51 itagaki Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -412,9 +412,29 @@ ProcedureCreate(const char *procedureName,
/* Verify function body */ /* Verify function body */
if (OidIsValid(languageValidator)) if (OidIsValid(languageValidator))
{ {
ArrayType *set_items;
int save_nestlevel;
/* Advance command counter so new tuple can be seen by validator */ /* Advance command counter so new tuple can be seen by validator */
CommandCounterIncrement(); CommandCounterIncrement();
/* Set per-function configuration parameters */
set_items = (ArrayType *) DatumGetPointer(proconfig);
if (set_items) /* Need a new GUC nesting level */
{
save_nestlevel = NewGUCNestLevel();
ProcessGUCArray(set_items,
(superuser() ? PGC_SUSET : PGC_USERSET),
PGC_S_SESSION,
GUC_ACTION_SAVE);
}
else
save_nestlevel = 0; /* keep compiler quiet */
OidFunctionCall1(languageValidator, ObjectIdGetDatum(retval)); OidFunctionCall1(languageValidator, ObjectIdGetDatum(retval));
if (set_items)
AtEOXact_GUC(true, save_nestlevel);
} }
return retval; return retval;