database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-04 20:11:56 +03:00
Code Activity

Back-patch 8.0 version of plperl_hash_from_tuple() into prior releases

Browse Source 
to fix failure to cope with quote marks in field values; not to mention
that it is shorter and faster.  Per report from Charles Haron.
This commit is contained in:
Tom Lane
2005-01-26 17:09:28 +00:00
parent 38ab95f703
commit 483fa35176
1 changed files with 27 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/pl/plperl/plperl.c
View File

@@ -33,7 +33,7 @@
* ENHANCEMENTS, OR MODIFICATIONS. * ENHANCEMENTS, OR MODIFICATIONS.
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/pl/plperl/plperl.c,v 1.35 2002/09/21 18:39:26 tgl Exp $ * $Header: /cvsroot/pgsql/src/pl/plperl/plperl.c,v 1.35.2.1 2005/01/26 17:09:28 tgl Exp $
* *
**********************************************************************/ **********************************************************************/
@@ -731,72 +731,53 @@ compile_plperl_function(Oid fn_oid, bool is_trigger)
/********************************************************************** /**********************************************************************
* plperl_build_tuple_argument() - Build a string for a ref to a hash * plperl_build_tuple_argument() - Build a ref to a hash
* from all attributes of a given tuple * from all attributes of a given tuple
**********************************************************************/ **********************************************************************/
static SV * static SV *
plperl_build_tuple_argument(HeapTuple tuple, TupleDesc tupdesc) plperl_build_tuple_argument(HeapTuple tuple, TupleDesc tupdesc)
{ {
HV *hv;
int i; int i;
SV *output;
Datum attr;
bool isnull;
char *attname;
char *outputstr;
HeapTuple typeTup;
Oid typoutput;
Oid typelem;
output = sv_2mortal(newSVpv("{", 0)); hv = newHV();
for (i = 0; i < tupdesc->natts; i++) for (i = 0; i < tupdesc->natts; i++)
{ {
/************************************************************ Datum attr;
* Get the attribute name bool isnull;
************************************************************/ char *attname;
attname = tupdesc->attrs[i]->attname.data; char *outputstr;
Oid typoutput;
Oid typioparam;
bool typisvarlena;
int namelen;
/************************************************************ if (tupdesc->attrs[i]->attisdropped)
* Get the attributes value continue;
************************************************************/
attname = NameStr(tupdesc->attrs[i]->attname);
namelen = strlen(attname);
attr = heap_getattr(tuple, i + 1, tupdesc, &isnull); attr = heap_getattr(tuple, i + 1, tupdesc, &isnull);
/************************************************************ if (isnull) {
* If it is null it will be set to undef in the hash. /* Store (attname => undef) and move on. */
************************************************************/ hv_store(hv, attname, namelen, newSV(0), 0);
if (isnull)
{
sv_catpvf(output, "'%s' => undef,", attname);
continue; continue;
} }
/************************************************************ /* XXX should have a way to cache these lookups */
* Lookup the attribute type in the syscache
* for the output function
************************************************************/
typeTup = SearchSysCache(TYPEOID,
ObjectIdGetDatum(tupdesc->attrs[i]->atttypid),
0, 0, 0);
if (!HeapTupleIsValid(typeTup))
elog(ERROR, "plperl: Cache lookup for attribute '%s' type %u failed",
attname, tupdesc->attrs[i]->atttypid);
typoutput = ((Form_pg_type) GETSTRUCT(typeTup))->typoutput; getTypeOutputInfo(tupdesc->attrs[i]->atttypid,
typelem = ((Form_pg_type) GETSTRUCT(typeTup))->typelem; &typoutput, &typioparam, &typisvarlena);
ReleaseSysCache(typeTup);
/************************************************************
* Append the attribute name and the value to the list.
************************************************************/
outputstr = DatumGetCString(OidFunctionCall3(typoutput, outputstr = DatumGetCString(OidFunctionCall3(typoutput,
attr, attr,
ObjectIdGetDatum(typelem), ObjectIdGetDatum(typioparam),
Int32GetDatum(tupdesc->attrs[i]->atttypmod))); Int32GetDatum(tupdesc->attrs[i]->atttypmod)));
sv_catpvf(output, "'%s' => '%s',", attname, outputstr);
pfree(outputstr); hv_store(hv, attname, namelen, newSVpv(outputstr, 0), 0);
} }
sv_catpv(output, "}"); return newRV_noinc((SV *) hv);
output = perl_eval_pv(SvPV(output, PL_na), TRUE);
return output;
} }