diff options
author | Tom Lane <tgl@sss.pgh.pa.us> | 2010-10-31 11:42:51 -0400 |
---|---|---|
committer | Tom Lane <tgl@sss.pgh.pa.us> | 2010-10-31 11:42:51 -0400 |
commit | 76b12e0af765b2ca2eeddcabdd5e7c22eda164da (patch) | |
tree | 7c33ae67ed542302f5055c41ef9baf58fd0e7da0 /src/pl/plperl/plperl.c | |
parent | 186cbbda8f8dc5e42f68fc7892f206a76d56a20f (diff) | |
download | postgresql-REL9_1_ALPHA2.tar.gz postgresql-REL9_1_ALPHA2.zip |
Revert removal of trigger flag from plperl function hash key.REL9_1_ALPHA2
As noted by Jan Urbanski, this flag is in fact needed to ensure that the
function's input/result conversion functions are set up as expected.
Add a regression test to discourage anyone from making same mistake
in future.
Diffstat (limited to 'src/pl/plperl/plperl.c')
-rw-r--r-- | src/pl/plperl/plperl.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c index 44becda3f32..270e9f78e05 100644 --- a/src/pl/plperl/plperl.c +++ b/src/pl/plperl/plperl.c @@ -113,7 +113,7 @@ typedef struct plperl_proc_desc /********************************************************************** * For speedy lookup, we maintain a hash table mapping from - * function OID + user OID to plperl_proc_desc pointers. + * function OID + trigger flag + user OID to plperl_proc_desc pointers. * The reason the plperl_proc_desc struct isn't directly part of the hash * entry is to simplify recovery from errors during compile_plperl_function. * @@ -127,6 +127,11 @@ typedef struct plperl_proc_desc typedef struct plperl_proc_key { Oid proc_id; /* Function OID */ + /* + * is_trigger is really a bool, but declare as Oid to ensure this struct + * contains no padding + */ + Oid is_trigger; /* is it a trigger function? */ Oid user_id; /* User calling the function, or 0 */ } plperl_proc_key; @@ -1955,6 +1960,7 @@ compile_plperl_function(Oid fn_oid, bool is_trigger) /* Try to find function in plperl_proc_hash */ proc_key.proc_id = fn_oid; + proc_key.is_trigger = is_trigger; proc_key.user_id = GetUserId(); proc_ptr = hash_search(plperl_proc_hash, &proc_key, |