mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-12-21 08:29:39 +08:00
Allow plperl_sv_to_datum to look through scalar refs.
There seems little reason for the policy of throwing error if we find a ref to something other than a hash or array. Recursively look through the ref, instead. This makes the behavior in non-transform cases comparable to what was already instantiated for jsonb_plperl. Note that because we invoke any available transform function before considering the ref case, it's up to each transform function whether it wants to play along with this behavior or do something different. Because the previous behavior was just to throw a useless error, this seems unlikely to create any compatibility issues. Still, given the lack of field complaints so far, seems best not to back-patch. Discussion: https://postgr.es/m/28336.1528393969@sss.pgh.pa.us
This commit is contained in:
parent
e4300a3552
commit
3a382983d1
@ -763,14 +763,17 @@ $$ LANGUAGE plperl;
|
||||
SELECT text_obj();
|
||||
ERROR: cannot convert Perl hash to non-composite type text
|
||||
CONTEXT: PL/Perl function "text_obj"
|
||||
----- make sure we can't return a scalar ref
|
||||
-- test looking through a scalar ref
|
||||
CREATE OR REPLACE FUNCTION text_scalarref() RETURNS text AS $$
|
||||
my $str = 'str';
|
||||
return \$str;
|
||||
$$ LANGUAGE plperl;
|
||||
SELECT text_scalarref();
|
||||
ERROR: PL/Perl function must return reference to hash or array
|
||||
CONTEXT: PL/Perl function "text_scalarref"
|
||||
text_scalarref
|
||||
----------------
|
||||
str
|
||||
(1 row)
|
||||
|
||||
-- check safe behavior when a function body is replaced during execution
|
||||
CREATE OR REPLACE FUNCTION self_modify(INTEGER) RETURNS INTEGER AS $$
|
||||
spi_exec_query('CREATE OR REPLACE FUNCTION self_modify(INTEGER) RETURNS INTEGER AS \'return $_[0] * 3;\' LANGUAGE plperl;');
|
||||
|
@ -1402,11 +1402,13 @@ plperl_sv_to_datum(SV *sv, Oid typid, int32 typmod,
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* Reference, but not reference to hash or array ... */
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_DATATYPE_MISMATCH),
|
||||
errmsg("PL/Perl function must return reference to hash or array")));
|
||||
return (Datum) 0; /* shut up compiler */
|
||||
/*
|
||||
* If it's a reference to something else, such as a scalar, just
|
||||
* recursively look through the reference.
|
||||
*/
|
||||
return plperl_sv_to_datum(SvRV(sv), typid, typmod,
|
||||
fcinfo, finfo, typioparam,
|
||||
isnull);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -504,7 +504,7 @@ $$ LANGUAGE plperl;
|
||||
|
||||
SELECT text_obj();
|
||||
|
||||
----- make sure we can't return a scalar ref
|
||||
-- test looking through a scalar ref
|
||||
CREATE OR REPLACE FUNCTION text_scalarref() RETURNS text AS $$
|
||||
my $str = 'str';
|
||||
return \$str;
|
||||
|
Loading…
Reference in New Issue
Block a user