Convert a perl array to a postgres array when returned by Set Returning Functions...

diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c
index d8edde2fdf4847161282067b37dde1d34d930f86..4186264430487da0b418add41f031c4f9d76332b 100644 (file)
--- a/src/pl/plperl/plperl.c
+++ b/src/pl/plperl/plperl.c
@@ -1,7 +1,7 @@
 /**********************************************************************
  * plperl.c - perl as a procedural language for PostgreSQL
  *
- *       $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.123.2.6 2009/06/05 20:32:27 adunstan Exp $
+ *       $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.123.2.7 2009/09/28 17:30:24 adunstan Exp $
  *
  **********************************************************************/
 
@@ -1960,7 +1960,15 @@ plperl_return_next(SV *sv)
 
                if (SvOK(sv))
                {
-                       char       *val = SvPV(sv, PL_na);
+                       char       *val;
+
+                       if (prodesc->fn_retisarray && SvROK(sv) &&
+                               SvTYPE(SvRV(sv)) == SVt_PVAV)
+                       {
+                               sv = plperl_convert_to_pg_array(sv);
+                       }
+
+                       val = SvPV(sv, PL_na);
 
                        ret = InputFunctionCall(&prodesc->result_in_func, val,
                                                                        prodesc->result_typioparam, -1);