Set per-function GUC settings during validating the function.

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

Reported by Erwin Brandstetter.

diff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c
index c787662afca5c993acb6fb81602521357d4edc18..22c3861f69dc9f45de0603d7a0532a490b5d11f7 100644 (file)
--- a/src/backend/catalog/pg_proc.c
+++ b/src/backend/catalog/pg_proc.c
@@ -8,7 +8,7 @@
  *
  *
  * 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 */
    if (OidIsValid(languageValidator))
    {
+       ArrayType  *set_items;
+       int         save_nestlevel;
+
        /* Advance command counter so new tuple can be seen by validator */
        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));
+
+       if (set_items)
+           AtEOXact_GUC(true, save_nestlevel);
    }
 
    return retval;