*** pgsql/src/pl/plperl/plperl.c	2010/02/12 04:32:02	1.150.2.5
--- pgsql/src/pl/plperl/plperl.c	2010/03/09 22:34:49	1.150.2.6
***************
*** 1,7 ****
  /**********************************************************************
   * plperl.c - perl as a procedural language for PostgreSQL
   *
!  *	  $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.150.2.4 2009/12/29 17:41:09 heikki Exp $
   *
   **********************************************************************/
  
--- 1,7 ----
  /**********************************************************************
   * plperl.c - perl as a procedural language for PostgreSQL
   *
!  *	  $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.150.2.5 2010/02/12 04:32:02 adunstan Exp $
   *
   **********************************************************************/
  
*************** plperl_modify_tuple(HV *hvTD, TriggerDat
*** 793,799 ****
  		ereport(ERROR,
  				(errcode(ERRCODE_UNDEFINED_COLUMN),
  				 errmsg("$_TD->{new} does not exist")));
! 	if (!SvOK(*svp) || SvTYPE(*svp) != SVt_RV || SvTYPE(SvRV(*svp)) != SVt_PVHV)
  		ereport(ERROR,
  				(errcode(ERRCODE_DATATYPE_MISMATCH),
  				 errmsg("$_TD->{new} is not a hash reference")));
--- 793,799 ----
  		ereport(ERROR,
  				(errcode(ERRCODE_UNDEFINED_COLUMN),
  				 errmsg("$_TD->{new} does not exist")));
! 	if (!SvOK(*svp) || !SvROK(*svp) || SvTYPE(SvRV(*svp)) != SVt_PVHV)
  		ereport(ERROR,
  				(errcode(ERRCODE_DATATYPE_MISMATCH),
  				 errmsg("$_TD->{new} is not a hash reference")));
*************** plperl_func_handler(PG_FUNCTION_ARGS)
*** 1284,1290 ****
  		 * value is an error, except undef which means return an empty set.
  		 */
  		if (SvOK(perlret) &&
! 			SvTYPE(perlret) == SVt_RV &&
  			SvTYPE(SvRV(perlret)) == SVt_PVAV)
  		{
  			int			i = 0;
--- 1284,1290 ----
  		 * value is an error, except undef which means return an empty set.
  		 */
  		if (SvOK(perlret) &&
! 			SvROK(perlret) &&
  			SvTYPE(SvRV(perlret)) == SVt_PVAV)
  		{
  			int			i = 0;
*************** plperl_func_handler(PG_FUNCTION_ARGS)
*** 1329,1335 ****
  		AttInMetadata *attinmeta;
  		HeapTuple	tup;
  
! 		if (!SvOK(perlret) || SvTYPE(perlret) != SVt_RV ||
  			SvTYPE(SvRV(perlret)) != SVt_PVHV)
  		{
  			ereport(ERROR,
--- 1329,1335 ----
  		AttInMetadata *attinmeta;
  		HeapTuple	tup;
  
! 		if (!SvOK(perlret) || !SvROK(perlret) ||
  			SvTYPE(SvRV(perlret)) != SVt_PVHV)
  		{
  			ereport(ERROR,
*************** plperl_return_next(SV *sv)
*** 1919,1925 ****
  				 errmsg("cannot use return_next in a non-SETOF function")));
  
  	if (prodesc->fn_retistuple &&
! 		!(SvOK(sv) && SvTYPE(sv) == SVt_RV && SvTYPE(SvRV(sv)) == SVt_PVHV))
  		ereport(ERROR,
  				(errcode(ERRCODE_DATATYPE_MISMATCH),
  				 errmsg("SETOF-composite-returning PL/Perl function "
--- 1919,1925 ----
  				 errmsg("cannot use return_next in a non-SETOF function")));
  
  	if (prodesc->fn_retistuple &&
! 		!(SvOK(sv) && SvROK(sv) && SvTYPE(SvRV(sv)) == SVt_PVHV))
  		ereport(ERROR,
  				(errcode(ERRCODE_DATATYPE_MISMATCH),
  				 errmsg("SETOF-composite-returning PL/Perl function "