diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/pl/plpython/plpython.c | 27 | ||||
| -rw-r--r-- | src/pl/tcl/pltcl.c | 25 |
2 files changed, 29 insertions, 23 deletions
diff --git a/src/pl/plpython/plpython.c b/src/pl/plpython/plpython.c index 2ef4778cdf..aeaccf6810 100644 --- a/src/pl/plpython/plpython.c +++ b/src/pl/plpython/plpython.c @@ -2309,27 +2309,34 @@ PLy_spi_prepare(PyObject * self, PyObject * args) for (i = 0; i < nargs; i++) { char *sptr; - List *names; HeapTuple typeTup; + Oid typeId; + int32 typmod; Form_pg_type typeStruct; optr = PySequence_GetItem(list, i); if (!PyString_Check(optr)) elog(ERROR, "Type names must be strings."); sptr = PyString_AsString(optr); + + /******************************************************** + * Resolve argument type names and then look them up by + * oid in the system cache, and remember the required + *information for input conversion. + ********************************************************/ + + parseTypeString(sptr, &typeId, &typmod); + + typeTup = SearchSysCache(TYPEOID, + ObjectIdGetDatum(typeId), + 0,0,0); + if (!HeapTupleIsValid(typeTup)) + elog(ERROR, "cache lookup failed for type %u", typeId); - /* - * Parse possibly-qualified type name and look it up in - * pg_type - */ - names = stringToQualifiedNameList(sptr, - "PLy_spi_prepare"); - typeTup = typenameType(NULL, - makeTypeNameFromNameList(names)); Py_DECREF(optr); optr = NULL; /* this is important */ - plan->types[i] = HeapTupleGetOid(typeTup); + plan->types[i] = typeId; typeStruct = (Form_pg_type) GETSTRUCT(typeTup); if (typeStruct->typtype != 'c') PLy_output_datum_func(&plan->args[i], typeTup); diff --git a/src/pl/tcl/pltcl.c b/src/pl/tcl/pltcl.c index fa69acbf92..d03aaed0eb 100644 --- a/src/pl/tcl/pltcl.c +++ b/src/pl/tcl/pltcl.c @@ -1808,23 +1808,22 @@ pltcl_SPI_prepare(ClientData cdata, Tcl_Interp *interp, PG_TRY(); { /************************************************************ - * Lookup the argument types by name in the system cache - * and remember the required information for input conversion + * Resolve argument type names and then look them up by oid + * in the system cache, and remember the required information + * for input conversion. ************************************************************/ for (i = 0; i < nargs; i++) { - List *names; - HeapTuple typeTup; + Oid typId, typInput, typIOParam; + int32 typmod; - /* Parse possibly-qualified type name and look it up in pg_type */ - names = stringToQualifiedNameList(args[i], - "pltcl_SPI_prepare"); - typeTup = typenameType(NULL, makeTypeNameFromNameList(names)); - qdesc->argtypes[i] = HeapTupleGetOid(typeTup); - perm_fmgr_info(((Form_pg_type) GETSTRUCT(typeTup))->typinput, - &(qdesc->arginfuncs[i])); - qdesc->argtypioparams[i] = getTypeIOParam(typeTup); - ReleaseSysCache(typeTup); + parseTypeString(args[i], &typId, &typmod); + + getTypeInputInfo(typId, &typInput, &typIOParam); + + qdesc->argtypes[i] = typId; + perm_fmgr_info(typInput, &(qdesc->arginfuncs[i])); + qdesc->argtypioparams[i] = typIOParam; } /************************************************************ |