OSDN Git Service

Move exprType(), exprTypmod(), expression_tree_walker(), and related routines
[pg-rex/syncrep.git] / src / backend / utils / adt / xml.c
index c670f8e..fd0c0ee 100644 (file)
@@ -4,10 +4,10 @@
  *       XML data type support.
  *
  *
- * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/utils/adt/xml.c,v 1.52 2007/11/08 13:12:56 petere Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/xml.c,v 1.76 2008/08/25 22:42:34 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
  * fail.  For one thing, this avoids having to manage variant catalog
  * installations.  But it also has nice effects such as that you can
  * dump a database containing XML type data even if the server is not
- * linked with libxml.  Thus, make sure xml_out() works even if nothing
+ * linked with libxml. Thus, make sure xml_out() works even if nothing
  * else does.
  */
 
 /*
- * Note on memory management: Via callbacks, libxml is told to use
- * palloc and friends for memory management.  Sometimes, libxml
- * allocates global structures in the hope that it can reuse them
- * later on, but if "later" is much later, the memory context
- * management of PostgreSQL will have blown those structures away
- * without telling libxml about it.  Therefore, it is important to
- * call xmlCleanupParser() or perhaps some other cleanup function
- * after using such functions, for example something from
- * libxml/parser.h or libxml/xmlsave.h.  Unfortunately, you cannot
- * readily tell from the API documentation when that happens, so
- * careful evaluation is necessary when introducing new libxml APIs
- * here.
+ * Notes on memory management:
+ *
+ * Via callbacks, libxml is told to use palloc and friends for memory
+ * management, within a context that we reset at transaction end (and also at
+ * subtransaction abort) to prevent memory leaks.  Resetting at transaction or
+ * subtransaction abort is necessary since we might have thrown a longjmp
+ * while some data structures were not linked from anywhere persistent.
+ * Resetting at transaction commit might not be necessary, but seems a good
+ * idea to forestall long-term leaks.
+ *
+ * Sometimes libxml allocates global structures in the hope that it can reuse
+ * them later on.  Therefore, before resetting LibxmlContext, we must tell
+ * libxml to discard any global data it has.  The libxml API documentation is
+ * not very good about specifying this, but for now we assume that
+ * xmlCleanupParser() will get rid of anything we need to worry about.
+ *
+ * We use palloc --- which will throw a longjmp on error --- for allocation
+ * callbacks that officially should act like malloc, ie, return NULL on
+ * out-of-memory.  This is a bit risky since there is a chance of leaving
+ * persistent libxml data structures in an inconsistent partially-constructed
+ * state, perhaps leading to crash in xmlCleanupParser().  However, as of
+ * early 2008 it is *known* that libxml can crash on out-of-memory due to
+ * inadequate checks for NULL returns, so this behavior seems the lesser
+ * of two evils.
  */
 
 #include "postgres.h"
@@ -49,7 +61,7 @@
 #include <libxml/xmlwriter.h>
 #include <libxml/xpath.h>
 #include <libxml/xpathInternals.h>
-#endif /* USE_LIBXML */
+#endif   /* USE_LIBXML */
 
 #include "catalog/namespace.h"
 #include "catalog/pg_type.h"
 #include "mb/pg_wchar.h"
 #include "miscadmin.h"
 #include "nodes/execnodes.h"
-#include "parser/parse_expr.h"
+#include "nodes/nodeFuncs.h"
 #include "utils/array.h"
 #include "utils/builtins.h"
 #include "utils/date.h"
 #include "utils/datetime.h"
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
-#include "access/tupmacs.h"
 #include "utils/xml.h"
 
 
 /* GUC variables */
-XmlBinaryType xmlbinary;
-XmlOptionType xmloption;
+int xmlbinary;
+int xmloption;
 
 #ifdef USE_LIBXML
 
 static StringInfo xml_err_buf = NULL;
-
-static void    xml_init(void);
-static void    *xml_palloc(size_t size);
-static void    *xml_repalloc(void *ptr, size_t size);
-static void    xml_pfree(void *ptr);
-static char    *xml_pstrdup(const char *string);
-static void    xml_ereport(int level, int sqlcode, const char *msg);
-static void    xml_errorHandler(void *ctxt, const char *msg, ...);
-static void    xml_ereport_by_code(int level, int sqlcode,
-                                                                       const char *msg, int errcode);
+static MemoryContext LibxmlContext = NULL;
+
+static void xml_init(void);
+static void xml_memory_init(void);
+static void xml_memory_cleanup(void);
+static void *xml_palloc(size_t size);
+static void *xml_repalloc(void *ptr, size_t size);
+static void xml_pfree(void *ptr);
+static char *xml_pstrdup(const char *string);
+static void xml_ereport(int level, int sqlcode, const char *msg);
+static void xml_errorHandler(void *ctxt, const char *msg,...);
+static void xml_ereport_by_code(int level, int sqlcode,
+                                       const char *msg, int errcode);
 static xmlChar *xml_text2xmlChar(text *in);
-static int             parse_xml_decl(const xmlChar *str, size_t *lenp,
-                                                          xmlChar **version, xmlChar **encoding, int *standalone);
-static bool            print_xml_decl(StringInfo buf, const xmlChar *version,
-                                                          pg_enc encoding, int standalone);
+static int parse_xml_decl(const xmlChar * str, size_t *lenp,
+                          xmlChar ** version, xmlChar ** encoding, int *standalone);
+static bool print_xml_decl(StringInfo buf, const xmlChar * version,
+                          pg_enc encoding, int standalone);
 static xmlDocPtr xml_parse(text *data, XmlOptionType xmloption_arg,
-                                                  bool preserve_whitespace, xmlChar *encoding);
-static text            *xml_xmlnodetoxmltype(xmlNodePtr cur);
-
-#endif /* USE_LIBXML */
+                 bool preserve_whitespace, xmlChar * encoding);
+static text *xml_xmlnodetoxmltype(xmlNodePtr cur);
+#endif   /* USE_LIBXML */
 
 static StringInfo query_to_xml_internal(const char *query, char *tablename,
                                          const char *xmlschema, bool nulls, bool tableforest,
                                          const char *targetns, bool top_level);
 static const char *map_sql_table_to_xmlschema(TupleDesc tupdesc, Oid relid,
-                                                  bool nulls, bool tableforest, const char *targetns);
+                                                bool nulls, bool tableforest, const char *targetns);
 static const char *map_sql_schema_to_xmlschema_types(Oid nspid,
                                                                  List *relid_list, bool nulls,
                                                                  bool tableforest, const char *targetns);
 static const char *map_sql_catalog_to_xmlschema_types(List *nspid_list,
                                                                   bool nulls, bool tableforest,
                                                                   const char *targetns);
-static const char * map_sql_type_to_xml_name(Oid typeoid, int typmod);
-static const char * map_sql_typecoll_to_xmlschema_types(List *tupdesc_list);
-static const char * map_sql_type_to_xmlschema_type(Oid typeoid, int typmod);
+static const char *map_sql_type_to_xml_name(Oid typeoid, int typmod);
+static const char *map_sql_typecoll_to_xmlschema_types(List *tupdesc_list);
+static const char *map_sql_type_to_xmlschema_type(Oid typeoid, int typmod);
 static void SPI_sql_row_to_xmlelement(int rownum, StringInfo result,
                                                  char *tablename, bool nulls, bool tableforest,
                                                  const char *targetns, bool top_level);
@@ -123,14 +136,10 @@ static void SPI_sql_row_to_xmlelement(int rownum, StringInfo result,
        ereport(ERROR, \
                        (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), \
                         errmsg("unsupported XML feature"), \
-                        errdetail("This functionality requires libxml."), \
+                        errdetail("This functionality requires the server to be built with libxml support."), \
                         errhint("You need to rebuild PostgreSQL using --with-libxml.")))
 
 
-#define _textin(str) DirectFunctionCall1(textin, CStringGetDatum(str))
-#define _textout(x) DatumGetCString(DirectFunctionCall1(textout, PointerGetDatum(x)))
-
-
 /* from SQL/XML:2003 section 4.7 */
 #define NAMESPACE_XSD "http://www.w3.org/2001/XMLSchema"
 #define NAMESPACE_XSI "http://www.w3.org/2001/XMLSchema-instance"
@@ -140,9 +149,9 @@ static void SPI_sql_row_to_xmlelement(int rownum, StringInfo result,
 #ifdef USE_LIBXML
 
 static int
-xmlChar_to_encoding(xmlChar *encoding_name)
+xmlChar_to_encoding(xmlChar * encoding_name)
 {
-       int             encoding = pg_char_to_encoding((char *) encoding_name);
+       int                     encoding = pg_char_to_encoding((char *) encoding_name);
 
        if (encoding < 0)
                ereport(ERROR,
@@ -151,27 +160,29 @@ xmlChar_to_encoding(xmlChar *encoding_name)
                                                (char *) encoding_name)));
        return encoding;
 }
-
 #endif
 
 
+/*
+ * xml_in uses a plain C string to VARDATA conversion, so for the time being
+ * we use the conversion function for the text datatype.
+ *
+ * This is only acceptable so long as xmltype and text use the same
+ * representation.
+ */
 Datum
 xml_in(PG_FUNCTION_ARGS)
 {
 #ifdef USE_LIBXML
-       char            *s = PG_GETARG_CSTRING(0);
-       size_t          len;
-       xmltype         *vardata;
-       xmlDocPtr        doc;
+       char       *s = PG_GETARG_CSTRING(0);
+       xmltype    *vardata;
+       xmlDocPtr       doc;
 
-       len = strlen(s);
-       vardata = palloc(len + VARHDRSZ);
-       SET_VARSIZE(vardata, len + VARHDRSZ);
-       memcpy(VARDATA(vardata), s, len);
+       vardata = (xmltype *) cstring_to_text(s);
 
        /*
-        * Parse the data to check if it is well-formed XML data.  Assume
-        * that ERROR occurred if parsing failed.
+        * Parse the data to check if it is well-formed XML data.  Assume that
+        * ERROR occurred if parsing failed.
         */
        doc = xml_parse(vardata, xmloption, true, NULL);
        xmlFreeDoc(doc);
@@ -187,26 +198,32 @@ xml_in(PG_FUNCTION_ARGS)
 #define PG_XML_DEFAULT_VERSION "1.0"
 
 
+/*
+ * xml_out_internal uses a plain VARDATA to C string conversion, so for the
+ * time being we use the conversion function for the text datatype.
+ *
+ * This is only acceptable so long as xmltype and text use the same
+ * representation.
+ */
 static char *
 xml_out_internal(xmltype *x, pg_enc target_encoding)
 {
-       char            *str;
+       char       *str;
        size_t          len;
+
 #ifdef USE_LIBXML
-       xmlChar         *version;
-       xmlChar         *encoding;
+       xmlChar    *version;
+       xmlChar    *encoding;
        int                     standalone;
        int                     res_code;
 #endif
 
-       len = VARSIZE(x) - VARHDRSZ;
-       str = palloc(len + 1);
-       memcpy(str, VARDATA(x), len);
-       str[len] = '\0';
+       str = text_to_cstring((text *) x);
+       len = strlen(str);
 
 #ifdef USE_LIBXML
        if ((res_code = parse_xml_decl((xmlChar *) str,
-                                                                  &len, &version, &encoding, &standalone)) == 0)
+                                                          &len, &version, &encoding, &standalone)) == 0)
        {
                StringInfoData buf;
 
@@ -215,9 +232,9 @@ xml_out_internal(xmltype *x, pg_enc target_encoding)
                if (!print_xml_decl(&buf, version, target_encoding, standalone))
                {
                        /*
-                        * If we are not going to produce an XML declaration, eat
-                        * a single newline in the original string to prevent
-                        * empty first lines in the output.
+                        * If we are not going to produce an XML declaration, eat a single
+                        * newline in the original string to prevent empty first lines in
+                        * the output.
                         */
                        if (*(str + len) == '\n')
                                len += 1;
@@ -238,13 +255,13 @@ xml_out_internal(xmltype *x, pg_enc target_encoding)
 Datum
 xml_out(PG_FUNCTION_ARGS)
 {
-       xmltype    *x = PG_GETARG_XML_P(0);
+       xmltype    *x = PG_GETARG_XML_P(0);
 
        /*
-        * xml_out removes the encoding property in all cases.  This is
-        * because we cannot control from here whether the datum will be
-        * converted to a different client encoding, so we'd do more harm
-        * than good by including it.
+        * xml_out removes the encoding property in all cases.  This is because we
+        * cannot control from here whether the datum will be converted to a
+        * different client encoding, so we'd do more harm than good by including
+        * it.
         */
        PG_RETURN_CSTRING(xml_out_internal(x, 0));
 }
@@ -255,17 +272,17 @@ xml_recv(PG_FUNCTION_ARGS)
 {
 #ifdef USE_LIBXML
        StringInfo      buf = (StringInfo) PG_GETARG_POINTER(0);
-       xmltype    *result;
+       xmltype    *result;
        char       *str;
        char       *newstr;
        int                     nbytes;
        xmlDocPtr       doc;
-       xmlChar    *encoding = NULL;
+       xmlChar    *encoding = NULL;
 
        /*
-        * Read the data in raw format. We don't know yet what the encoding
-        * is, as that information is embedded in the xml declaration; so we
-        * have to parse that before converting to server encoding.
+        * Read the data in raw format. We don't know yet what the encoding is, as
+        * that information is embedded in the xml declaration; so we have to
+        * parse that before converting to server encoding.
         */
        nbytes = buf->len - buf->cursor;
        str = (char *) pq_getmsgbytes(buf, nbytes);
@@ -284,8 +301,8 @@ xml_recv(PG_FUNCTION_ARGS)
        parse_xml_decl((xmlChar *) str, NULL, NULL, &encoding, NULL);
 
        /*
-        * Parse the data to check if it is well-formed XML data.  Assume
-        * that xml_parse will throw ERROR if not.
+        * Parse the data to check if it is well-formed XML data.  Assume that
+        * xml_parse will throw ERROR if not.
         */
        doc = xml_parse(result, xmloption, true, encoding);
        xmlFreeDoc(doc);
@@ -294,20 +311,14 @@ xml_recv(PG_FUNCTION_ARGS)
        newstr = (char *) pg_do_encoding_conversion((unsigned char *) str,
                                                                                                nbytes,
                                                                                                encoding ?
-                                                                                               xmlChar_to_encoding(encoding) :
+                                                                                         xmlChar_to_encoding(encoding) :
                                                                                                PG_UTF8,
                                                                                                GetDatabaseEncoding());
 
        if (newstr != str)
        {
                pfree(result);
-
-               nbytes = strlen(newstr);
-
-               result = palloc(nbytes + VARHDRSZ);
-               SET_VARSIZE(result, nbytes + VARHDRSZ);
-               memcpy(VARDATA(result), newstr, nbytes);
-
+               result = (xmltype *) cstring_to_text(newstr);
                pfree(newstr);
        }
 
@@ -322,13 +333,13 @@ xml_recv(PG_FUNCTION_ARGS)
 Datum
 xml_send(PG_FUNCTION_ARGS)
 {
-       xmltype    *x = PG_GETARG_XML_P(0);
+       xmltype    *x = PG_GETARG_XML_P(0);
        char       *outval;
        StringInfoData buf;
-       
+
        /*
-        * xml_out_internal doesn't convert the encoding, it just prints
-        * the right declaration. pq_sendtext will do the conversion.
+        * xml_out_internal doesn't convert the encoding, it just prints the right
+        * declaration. pq_sendtext will do the conversion.
         */
        outval = xml_out_internal(x, pg_get_client_encoding());
 
@@ -351,30 +362,14 @@ appendStringInfoText(StringInfo str, const text *t)
 static xmltype *
 stringinfo_to_xmltype(StringInfo buf)
 {
-       int32 len;
-       xmltype *result;
-
-       len = buf->len + VARHDRSZ;
-       result = palloc(len);
-       SET_VARSIZE(result, len);
-       memcpy(VARDATA(result), buf->data, buf->len);
-
-       return result;
+       return (xmltype *) cstring_to_text_with_len(buf->data, buf->len);
 }
 
 
 static xmltype *
 cstring_to_xmltype(const char *string)
 {
-       int32           len;
-       xmltype    *result;
-
-       len = strlen(string) + VARHDRSZ;
-       result = palloc(len);
-       SET_VARSIZE(result, len);
-       memcpy(VARDATA(result), string, len - VARHDRSZ);
-
-       return result;
+       return (xmltype *) cstring_to_text(string);
 }
 
 
@@ -382,15 +377,8 @@ cstring_to_xmltype(const char *string)
 static xmltype *
 xmlBuffer_to_xmltype(xmlBufferPtr buf)
 {
-       int32           len;
-       xmltype    *result;
-
-       len = xmlBufferLength(buf) + VARHDRSZ;
-       result = palloc(len);
-       SET_VARSIZE(result, len);
-       memcpy(VARDATA(result), xmlBufferContent(buf), len - VARHDRSZ);
-
-       return result;
+       return (xmltype *) cstring_to_text_with_len((char *) xmlBufferContent(buf),
+                                                                                               xmlBufferLength(buf));
 }
 #endif
 
@@ -399,11 +387,11 @@ Datum
 xmlcomment(PG_FUNCTION_ARGS)
 {
 #ifdef USE_LIBXML
-       text *arg = PG_GETARG_TEXT_P(0);
-       char *argdata = VARDATA(arg);
-       int len =  VARSIZE(arg) - VARHDRSZ;
+       text       *arg = PG_GETARG_TEXT_P(0);
+       char       *argdata = VARDATA(arg);
+       int                     len = VARSIZE(arg) - VARHDRSZ;
        StringInfoData buf;
-       int i;
+       int                     i;
 
        /* check for "--" in string or "-" at the end */
        for (i = 1; i < len; i++)
@@ -434,14 +422,14 @@ xmlcomment(PG_FUNCTION_ARGS)
 
 /*
  * TODO: xmlconcat needs to merge the notations and unparsed entities
- * of the argument values.  Not very important in practice, though.
+ * of the argument values.     Not very important in practice, though.
  */
 xmltype *
 xmlconcat(List *args)
 {
 #ifdef USE_LIBXML
        int                     global_standalone = 1;
-       xmlChar    *global_version = NULL;
+       xmlChar    *global_version = NULL;
        bool            global_version_no_value = false;
        StringInfoData buf;
        ListCell   *v;
@@ -449,16 +437,14 @@ xmlconcat(List *args)
        initStringInfo(&buf);
        foreach(v, args)
        {
-               xmltype    *x = DatumGetXmlP(PointerGetDatum(lfirst(v)));
+               xmltype    *x = DatumGetXmlP(PointerGetDatum(lfirst(v)));
                size_t          len;
-               xmlChar    *version;
+               xmlChar    *version;
                int                     standalone;
                char       *str;
 
                len = VARSIZE(x) - VARHDRSZ;
-               str = palloc(len + 1);
-               memcpy(str, VARDATA(x), len);
-               str[len] = '\0';
+               str = text_to_cstring((text *) x);
 
                parse_xml_decl((xmlChar *) str, &len, &version, NULL, &standalone);
 
@@ -534,9 +520,10 @@ texttoxml(PG_FUNCTION_ARGS)
 Datum
 xmltotext(PG_FUNCTION_ARGS)
 {
-       xmltype    *data = PG_GETARG_XML_P(0);
+       xmltype    *data = PG_GETARG_XML_P(0);
 
-       PG_RETURN_TEXT_P(xmltotext_with_xmloption(data, xmloption));
+       /* It's actually binary compatible. */
+       PG_RETURN_TEXT_P((text *) data);
 }
 
 
@@ -557,8 +544,8 @@ xmltype *
 xmlelement(XmlExprState *xmlExpr, ExprContext *econtext)
 {
 #ifdef USE_LIBXML
-       XmlExpr    *xexpr = (XmlExpr *) xmlExpr->xprstate.expr;
-       xmltype    *result;
+       XmlExpr    *xexpr = (XmlExpr *) xmlExpr->xprstate.expr;
+       xmltype    *result;
        List       *named_arg_strings;
        List       *arg_strings;
        int                     i;
@@ -568,16 +555,16 @@ xmlelement(XmlExprState *xmlExpr, ExprContext *econtext)
        xmlTextWriterPtr writer;
 
        /*
-        * We first evaluate all the arguments, then start up libxml and
-        * create the result.  This avoids issues if one of the arguments
-        * involves a call to some other function or subsystem that wants to use
-        * libxml on its own terms.
+        * We first evaluate all the arguments, then start up libxml and create
+        * the result.  This avoids issues if one of the arguments involves a call
+        * to some other function or subsystem that wants to use libxml on its own
+        * terms.
         */
        named_arg_strings = NIL;
        i = 0;
        foreach(arg, xmlExpr->named_args)
        {
-               ExprState       *e = (ExprState *) lfirst(arg);
+               ExprState  *e = (ExprState *) lfirst(arg);
                Datum           value;
                bool            isnull;
                char       *str;
@@ -594,7 +581,7 @@ xmlelement(XmlExprState *xmlExpr, ExprContext *econtext)
        arg_strings = NIL;
        foreach(arg, xmlExpr->args)
        {
-               ExprState       *e = (ExprState *) lfirst(arg);
+               ExprState  *e = (ExprState *) lfirst(arg);
                Datum           value;
                bool            isnull;
                char       *str;
@@ -619,8 +606,8 @@ xmlelement(XmlExprState *xmlExpr, ExprContext *econtext)
 
        forboth(arg, named_arg_strings, narg, xexpr->arg_names)
        {
-               char    *str = (char *) lfirst(arg);
-               char    *argname = strVal(lfirst(narg));
+               char       *str = (char *) lfirst(arg);
+               char       *argname = strVal(lfirst(narg));
 
                if (str)
                {
@@ -633,7 +620,7 @@ xmlelement(XmlExprState *xmlExpr, ExprContext *econtext)
 
        foreach(arg, arg_strings)
        {
-               char    *str = (char *) lfirst(arg);
+               char       *str = (char *) lfirst(arg);
 
                xmlTextWriterWriteRaw(writer, (xmlChar *) str);
        }
@@ -673,22 +660,22 @@ xmltype *
 xmlpi(char *target, text *arg, bool arg_is_null, bool *result_is_null)
 {
 #ifdef USE_LIBXML
-       xmltype *result;
+       xmltype    *result;
        StringInfoData buf;
 
-       if (pg_strncasecmp(target, "xml", 3) == 0)
+       if (pg_strcasecmp(target, "xml") == 0)
                ereport(ERROR,
-                               (errcode(ERRCODE_SYNTAX_ERROR), /* really */
+                               (errcode(ERRCODE_SYNTAX_ERROR), /* really */
                                 errmsg("invalid XML processing instruction"),
-                                errdetail("XML processing instruction target name cannot start with \"xml\".")));
+                                errdetail("XML processing instruction target name cannot be \"%s\".", target)));
 
        /*
-        * Following the SQL standard, the null check comes after the
-        * syntax check above.
+        * Following the SQL standard, the null check comes after the syntax check
+        * above.
         */
        *result_is_null = arg_is_null;
        if (*result_is_null)
-               return NULL;            
+               return NULL;
 
        initStringInfo(&buf);
 
@@ -696,14 +683,14 @@ xmlpi(char *target, text *arg, bool arg_is_null, bool *result_is_null)
 
        if (arg != NULL)
        {
-               char *string;
+               char       *string;
 
-               string = _textout(arg);
+               string = text_to_cstring(arg);
                if (strstr(string, "?>") != NULL)
-               ereport(ERROR,
-                               (errcode(ERRCODE_INVALID_XML_PROCESSING_INSTRUCTION),
-                                errmsg("invalid XML processing instruction"),
-                                errdetail("XML processing instruction cannot contain \"?>\".")));
+                       ereport(ERROR,
+                                       (errcode(ERRCODE_INVALID_XML_PROCESSING_INSTRUCTION),
+                                        errmsg("invalid XML processing instruction"),
+                       errdetail("XML processing instruction cannot contain \"?>\".")));
 
                appendStringInfoChar(&buf, ' ');
                appendStringInfoString(&buf, string + strspn(string, " "));
@@ -727,14 +714,12 @@ xmlroot(xmltype *data, text *version, int standalone)
 #ifdef USE_LIBXML
        char       *str;
        size_t          len;
-       xmlChar    *orig_version;
+       xmlChar    *orig_version;
        int                     orig_standalone;
        StringInfoData buf;
 
        len = VARSIZE(data) - VARHDRSZ;
-       str = palloc(len + 1);
-       memcpy(str, VARDATA(data), len);
-       str[len] = '\0';
+       str = text_to_cstring((text *) data);
 
        parse_xml_decl((xmlChar *) str, &len, &orig_version, NULL, &orig_standalone);
 
@@ -773,101 +758,19 @@ xmlroot(xmltype *data, text *version, int standalone)
 
 /*
  * Validate document (given as string) against DTD (given as external link)
- * TODO !!! use text instead of cstring for second arg
- * TODO allow passing DTD as a string value (not only as an URI)
- * TODO redesign (see comment with '!!!' below)
+ *
+ * This has been removed because it is a security hole: unprivileged users
+ * should not be able to use Postgres to fetch arbitrary external files,
+ * which unfortunately is exactly what libxml is willing to do with the DTD
+ * parameter.
  */
 Datum
 xmlvalidate(PG_FUNCTION_ARGS)
 {
-#ifdef USE_LIBXML
-       text                            *data = PG_GETARG_TEXT_P(0);
-       text                            *dtdOrUri = PG_GETARG_TEXT_P(1);
-       bool                            result = false;
-       xmlParserCtxtPtr        ctxt = NULL;
-       xmlDocPtr                       doc = NULL;
-       xmlDtdPtr                       dtd = NULL;
-
-       xml_init();
-
-       /* We use a PG_TRY block to ensure libxml parser is cleaned up on error */
-       PG_TRY();
-       {
-               xmlInitParser();
-               ctxt = xmlNewParserCtxt();
-               if (ctxt == NULL)
-                       xml_ereport(ERROR, ERRCODE_INTERNAL_ERROR,
-                                               "could not allocate parser context");
-
-               doc = xmlCtxtReadMemory(ctxt, (char *) VARDATA(data),
-                                                               VARSIZE(data) - VARHDRSZ,
-                                                               NULL, NULL, 0);
-               if (doc == NULL)
-                       xml_ereport(ERROR, ERRCODE_INVALID_XML_DOCUMENT,
-                                               "could not parse XML data");
-
-#if 0
-               uri = xmlCreateURI();
-               elog(NOTICE, "dtd - %s", dtdOrUri);
-               dtd = palloc(sizeof(xmlDtdPtr));
-               uri = xmlParseURI(dtdOrUri);
-               if (uri == NULL)
-                       xml_ereport(ERROR, ERRCODE_INTERNAL_ERROR,
-                                               "not implemented yet... (TODO)");
-               else
-#endif
-                       dtd = xmlParseDTD(NULL, xml_text2xmlChar(dtdOrUri));
-
-               if (dtd == NULL)
-                       xml_ereport(ERROR, ERRCODE_INVALID_XML_DOCUMENT,
-                                               "could not load DTD");
-
-               if (xmlValidateDtd(xmlNewValidCtxt(), doc, dtd) == 1)
-                       result = true;
-
-               if (!result)
-                       xml_ereport(NOTICE, ERRCODE_INVALID_XML_DOCUMENT,
-                                               "validation against DTD failed");
-
-#if 0
-               if (uri)
-                       xmlFreeURI(uri);
-               uri = NULL;
-#endif
-               if (dtd)
-                       xmlFreeDtd(dtd);
-               dtd = NULL;
-               if (doc)
-                       xmlFreeDoc(doc);
-               doc = NULL;
-               if (ctxt)
-                       xmlFreeParserCtxt(ctxt);
-               ctxt = NULL;
-               xmlCleanupParser();
-       }
-       PG_CATCH();
-       {
-#if 0
-               if (uri)
-                       xmlFreeURI(uri);
-#endif
-               if (dtd)
-                       xmlFreeDtd(dtd);
-               if (doc)
-                       xmlFreeDoc(doc);
-               if (ctxt)
-                       xmlFreeParserCtxt(ctxt);
-               xmlCleanupParser();
-
-               PG_RE_THROW();
-       }
-       PG_END_TRY();
-
-       PG_RETURN_BOOL(result);
-#else /* not USE_LIBXML */
-       NO_XML_SUPPORT();
+       ereport(ERROR,
+                       (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+                        errmsg("xmlvalidate is not implemented")));
        return 0;
-#endif /* not USE_LIBXML */
 }
 
 
@@ -886,7 +789,7 @@ xml_is_document(xmltype *arg)
        }
        PG_CATCH();
        {
-               ErrorData *errdata;
+               ErrorData  *errdata;
                MemoryContext ecxt;
 
                ecxt = MemoryContextSwitchTo(ccxt);
@@ -908,10 +811,23 @@ xml_is_document(xmltype *arg)
                xmlFreeDoc(doc);
 
        return result;
-#else /* not USE_LIBXML */
+#else                                                  /* not USE_LIBXML */
        NO_XML_SUPPORT();
        return false;
-#endif /* not USE_LIBXML */
+#endif   /* not USE_LIBXML */
+}
+
+
+/*
+ * xml cleanup function for transaction end.  This is also called on
+ * subtransaction abort; see notes at top of file for rationale.
+ */
+void
+AtEOXact_xml(void)
+{
+#ifdef USE_LIBXML
+       xml_memory_cleanup();
+#endif
 }
 
 
@@ -935,8 +851,8 @@ xml_init(void)
                MemoryContext oldcontext;
 
                /*
-                * Currently, we have no pure UTF-8 support for internals -- check
-                * if we can work.
+                * Currently, we have no pure UTF-8 support for internals -- check if
+                * we can work.
                 */
                if (sizeof(char) != sizeof(xmlChar))
                        ereport(ERROR,
@@ -953,7 +869,7 @@ xml_init(void)
                xmlSetGenericErrorFunc(NULL, xml_errorHandler);
 
                /* Set up memory allocation our way, too */
-               xmlMemSetup(xml_pfree, xml_palloc, xml_repalloc, xml_pstrdup);
+               xml_memory_init();
 
                /* Check library compatibility */
                LIBXML_TEST_VERSION;
@@ -970,11 +886,11 @@ xml_init(void)
                 * We re-establish the callback functions every time.  This makes it
                 * safe for other subsystems (PL/Perl, say) to also use libxml with
                 * their own callbacks ... so long as they likewise set up the
-                * callbacks on every use.  It's cheap enough to not be worth
-                * worrying about, anyway.
+                * callbacks on every use.      It's cheap enough to not be worth worrying
+                * about, anyway.
                 */
                xmlSetGenericErrorFunc(NULL, xml_errorHandler);
-               xmlMemSetup(xml_pfree, xml_palloc, xml_repalloc, xml_pstrdup);
+               xml_memory_init();
        }
 }
 
@@ -997,13 +913,24 @@ xml_init(void)
 #define SKIP_XML_SPACE(p) \
        while (xmlIsBlank_ch(*(p))) (p)++
 
+/* Letter | Digit | '.' | '-' | '_' | ':' | CombiningChar | Extender */
+/* Beware of multiple evaluations of argument! */
+#define PG_XMLISNAMECHAR(c) \
+       (xmlIsBaseChar_ch(c) || xmlIsIdeographicQ(c) \
+                       || xmlIsDigit_ch(c) \
+                       || c == '.' || c == '-' || c == '_' || c == ':' \
+                       || xmlIsCombiningQ(c) \
+                       || xmlIsExtender_ch(c))
+
 static int
-parse_xml_decl(const xmlChar *str,size_t *lenp,
-                          xmlChar **version, xmlChar **encoding, int *standalone)
+parse_xml_decl(const xmlChar * str, size_t *lenp,
+                          xmlChar ** version, xmlChar ** encoding, int *standalone)
 {
        const xmlChar *p;
        const xmlChar *save_p;
        size_t          len;
+       int                     utf8char;
+       int                     utf8len;
 
        xml_init();
 
@@ -1016,7 +943,13 @@ parse_xml_decl(const xmlChar *str,size_t *lenp,
 
        p = str;
 
-       if (xmlStrncmp(p, (xmlChar *)"<?xml", 5) != 0)
+       if (xmlStrncmp(p, (xmlChar *) "<?xml", 5) != 0)
+               goto finished;
+
+       /* if next char is name char, it's a PI like <?xml-stylesheet ...?> */
+       utf8len = strlen((const char *) (p + 5));
+       utf8char = xmlGetUTF8Char(p + 5, &utf8len);
+       if (PG_XMLISNAMECHAR(utf8char))
                goto finished;
 
        p += 5;
@@ -1024,7 +957,7 @@ parse_xml_decl(const xmlChar *str,size_t *lenp,
        /* version */
        CHECK_XML_SPACE(p);
        SKIP_XML_SPACE(p);
-       if (xmlStrncmp(p, (xmlChar *)"version", 7) != 0)
+       if (xmlStrncmp(p, (xmlChar *) "version", 7) != 0)
                return XML_ERR_VERSION_MISSING;
        p += 7;
        SKIP_XML_SPACE(p);
@@ -1051,7 +984,7 @@ parse_xml_decl(const xmlChar *str,size_t *lenp,
        /* encoding */
        save_p = p;
        SKIP_XML_SPACE(p);
-       if (xmlStrncmp(p, (xmlChar *)"encoding", 8) == 0)
+       if (xmlStrncmp(p, (xmlChar *) "encoding", 8) == 0)
        {
                CHECK_XML_SPACE(save_p);
                p += 8;
@@ -1070,7 +1003,7 @@ parse_xml_decl(const xmlChar *str,size_t *lenp,
                                return XML_ERR_MISSING_ENCODING;
 
                        if (encoding)
-                       *encoding = xmlStrndup(p + 1, q - p - 1);
+                               *encoding = xmlStrndup(p + 1, q - p - 1);
                        p = q + 1;
                }
                else
@@ -1084,7 +1017,7 @@ parse_xml_decl(const xmlChar *str,size_t *lenp,
        /* standalone */
        save_p = p;
        SKIP_XML_SPACE(p);
-       if (xmlStrncmp(p, (xmlChar *)"standalone", 10) == 0)
+       if (xmlStrncmp(p, (xmlChar *) "standalone", 10) == 0)
        {
                CHECK_XML_SPACE(save_p);
                p += 10;
@@ -1093,12 +1026,14 @@ parse_xml_decl(const xmlChar *str,size_t *lenp,
                        return XML_ERR_STANDALONE_VALUE;
                p += 1;
                SKIP_XML_SPACE(p);
-               if (xmlStrncmp(p, (xmlChar *)"'yes'", 5) == 0 || xmlStrncmp(p, (xmlChar *)"\"yes\"", 5) == 0)
+               if (xmlStrncmp(p, (xmlChar *) "'yes'", 5) == 0 ||
+                       xmlStrncmp(p, (xmlChar *) "\"yes\"", 5) == 0)
                {
                        *standalone = 1;
                        p += 5;
                }
-               else if (xmlStrncmp(p, (xmlChar *)"'no'", 4) == 0 || xmlStrncmp(p, (xmlChar *)"\"no\"", 4) == 0)
+               else if (xmlStrncmp(p, (xmlChar *) "'no'", 4) == 0 ||
+                                xmlStrncmp(p, (xmlChar *) "\"no\"", 4) == 0)
                {
                        *standalone = 0;
                        p += 4;
@@ -1112,7 +1047,7 @@ parse_xml_decl(const xmlChar *str,size_t *lenp,
        }
 
        SKIP_XML_SPACE(p);
-       if (xmlStrncmp(p, (xmlChar *)"?>", 2) != 0)
+       if (xmlStrncmp(p, (xmlChar *) "?>", 2) != 0)
                return XML_ERR_XMLDECL_NOT_FINISHED;
        p += 2;
 
@@ -1132,7 +1067,7 @@ finished:
 
 /*
  * Write an XML declaration.  On output, we adjust the XML declaration
- * as follows.  (These rules are the moral equivalent of the clause
+ * as follows. (These rules are the moral equivalent of the clause
  * "Serialization of an XML value" in the SQL standard.)
  *
  * We try to avoid generating an XML declaration if possible.  This is
@@ -1145,7 +1080,7 @@ finished:
  * which is the default version specified in SQL:2003.
  */
 static bool
-print_xml_decl(StringInfo buf, const xmlChar *version,
+print_xml_decl(StringInfo buf, const xmlChar * version,
                           pg_enc encoding, int standalone)
 {
        xml_init();
@@ -1164,8 +1099,8 @@ print_xml_decl(StringInfo buf, const xmlChar *version,
                if (encoding && encoding != PG_UTF8)
                {
                        /*
-                        * XXX might be useful to convert this to IANA names
-                        * (ISO-8859-1 instead of LATIN1 etc.); needs field experience
+                        * XXX might be useful to convert this to IANA names (ISO-8859-1
+                        * instead of LATIN1 etc.); needs field experience
                         */
                        appendStringInfo(buf, " encoding=\"%s\"",
                                                         pg_encoding_to_char(encoding));
@@ -1188,19 +1123,19 @@ print_xml_decl(StringInfo buf, const xmlChar *version,
  * Convert a C string to XML internal representation
  *
  * TODO maybe, libxml2's xmlreader is better? (do not construct DOM,
- * yet do not use SAX - see xml_reader.c)
+ * yet do not use SAX - see xmlreader.c)
  */
 static xmlDocPtr
 xml_parse(text *data, XmlOptionType xmloption_arg, bool preserve_whitespace,
-                 xmlChar *encoding)
+                 xmlChar * encoding)
 {
-       int32                           len;
-       xmlChar                         *string;
-       xmlChar                         *utf8string;
-       xmlParserCtxtPtr        ctxt = NULL;
-       xmlDocPtr                       doc = NULL;
+       int32           len;
+       xmlChar    *string;
+       xmlChar    *utf8string;
+       xmlParserCtxtPtr ctxt;
+       xmlDocPtr       doc;
 
-       len = VARSIZE(data) - VARHDRSZ; /* will be useful later */
+       len = VARSIZE(data) - VARHDRSZ;         /* will be useful later */
        string = xml_text2xmlChar(data);
 
        utf8string = pg_do_encoding_conversion(string,
@@ -1211,95 +1146,108 @@ xml_parse(text *data, XmlOptionType xmloption_arg, bool preserve_whitespace,
                                                                                   PG_UTF8);
 
        xml_init();
+       xmlInitParser();
+       ctxt = xmlNewParserCtxt();
+       if (ctxt == NULL)
+               xml_ereport(ERROR, ERRCODE_OUT_OF_MEMORY,
+                                       "could not allocate parser context");
 
-       /* We use a PG_TRY block to ensure libxml parser is cleaned up on error */
-       PG_TRY();
+       if (xmloption_arg == XMLOPTION_DOCUMENT)
        {
-               xmlInitParser();
-               ctxt = xmlNewParserCtxt();
-               if (ctxt == NULL)
-                       xml_ereport(ERROR, ERRCODE_INTERNAL_ERROR,
-                                               "could not allocate parser context");
-
-               if (xmloption_arg == XMLOPTION_DOCUMENT)
-               {
-                       /*
-                        * Note, that here we try to apply DTD defaults
-                        * (XML_PARSE_DTDATTR) according to SQL/XML:10.16.7.d:
-                        * 'Default valies defined by internal DTD are applied'.
-                        * As for external DTDs, we try to support them too, (see
-                        * SQL/XML:10.16.7.e)
-                        */
-                       doc = xmlCtxtReadDoc(ctxt, utf8string,
-                                                                NULL,
-                                                                "UTF-8",
-                                                                XML_PARSE_NOENT | XML_PARSE_DTDATTR
-                                                                | (preserve_whitespace ? 0 : XML_PARSE_NOBLANKS));
-                       if (doc == NULL)
-                               xml_ereport(ERROR, ERRCODE_INVALID_XML_DOCUMENT,
-                                                       "invalid XML document");
-               }
-               else
-               {
-                       int                     res_code;
-                       size_t count;
-                       xmlChar    *version = NULL;
-                       int standalone = -1;
-
-                       doc = xmlNewDoc(NULL);
-
-                       res_code = parse_xml_decl(utf8string, &count, &version, NULL, &standalone);
-                       if (res_code != 0)
-                               xml_ereport_by_code(ERROR, ERRCODE_INVALID_XML_CONTENT,
-                                                                       "invalid XML content: invalid XML declaration", res_code);
-
-                       res_code = xmlParseBalancedChunkMemory(doc, NULL, NULL, 0, utf8string + count, NULL);
-                       if (res_code != 0)
-                               xml_ereport(ERROR, ERRCODE_INVALID_XML_CONTENT,
-                                                       "invalid XML content");
-
-                       doc->version = xmlStrdup(version);
-                       doc->encoding = xmlStrdup((xmlChar *) "UTF-8");
-                       doc->standalone = standalone;
-               }
-
-               if (ctxt)
-                       xmlFreeParserCtxt(ctxt);
-               ctxt = NULL;
-               xmlCleanupParser();
+               /*
+                * Note, that here we try to apply DTD defaults
+                * (XML_PARSE_DTDATTR) according to SQL/XML:10.16.7.d: 'Default
+                * values defined by internal DTD are applied'. As for external
+                * DTDs, we try to support them too, (see SQL/XML:10.16.7.e)
+                */
+               doc = xmlCtxtReadDoc(ctxt, utf8string,
+                                                        NULL,
+                                                        "UTF-8",
+                                                        XML_PARSE_NOENT | XML_PARSE_DTDATTR
+                                                        | (preserve_whitespace ? 0 : XML_PARSE_NOBLANKS));
+               if (doc == NULL)
+                       xml_ereport(ERROR, ERRCODE_INVALID_XML_DOCUMENT,
+                                               "invalid XML document");
        }
-       PG_CATCH();
+       else
        {
-               if (doc)
-                       xmlFreeDoc(doc);
-               if (ctxt)
-                       xmlFreeParserCtxt(ctxt);
-               xmlCleanupParser();
+               int                     res_code;
+               size_t          count;
+               xmlChar    *version = NULL;
+               int                     standalone = -1;
 
-               PG_RE_THROW();
+               doc = xmlNewDoc(NULL);
+
+               res_code = parse_xml_decl(utf8string,
+                                                                 &count, &version, NULL, &standalone);
+               if (res_code != 0)
+                       xml_ereport_by_code(ERROR, ERRCODE_INVALID_XML_CONTENT,
+                                                               "invalid XML content: invalid XML declaration",
+                                                               res_code);
+
+               res_code = xmlParseBalancedChunkMemory(doc, NULL, NULL, 0,
+                                                                                          utf8string + count, NULL);
+               if (res_code != 0)
+                       xml_ereport(ERROR, ERRCODE_INVALID_XML_CONTENT,
+                                               "invalid XML content");
+
+               doc->version = xmlStrdup(version);
+               doc->encoding = xmlStrdup((xmlChar *) "UTF-8");
+               doc->standalone = standalone;
        }
-       PG_END_TRY();
+
+       xmlFreeParserCtxt(ctxt);
 
        return doc;
 }
 
 
 /*
- * xmlChar<->text convertions
+ * xmlChar<->text conversions
  */
 static xmlChar *
 xml_text2xmlChar(text *in)
 {
-       int32           len = VARSIZE(in) - VARHDRSZ;
-       xmlChar         *res;
+       return (xmlChar *) text_to_cstring(in);
+}
+
 
-       res = palloc(len + 1);
-       memcpy(res, VARDATA(in), len);
-       res[len] = '\0';
+/*
+ * Manage the special context used for all libxml allocations
+ */
+static void
+xml_memory_init(void)
+{
+       /*
+        * Create memory context if not there already.  We make it a child of
+        * TopMemoryContext, even though our current policy is that it doesn't
+        * survive past transaction end, because we want to be really really
+        * sure it doesn't go away before we've called xmlCleanupParser().
+        */
+       if (LibxmlContext == NULL)
+               LibxmlContext = AllocSetContextCreate(TopMemoryContext,
+                                                                                         "LibxmlContext",
+                                                                                         ALLOCSET_DEFAULT_MINSIZE,
+                                                                                         ALLOCSET_DEFAULT_INITSIZE,
+                                                                                         ALLOCSET_DEFAULT_MAXSIZE);
 
-       return(res);
+       /* Re-establish the callbacks even if already set */
+       xmlMemSetup(xml_pfree, xml_palloc, xml_repalloc, xml_pstrdup);
 }
 
+static void
+xml_memory_cleanup(void)
+{
+       if (LibxmlContext != NULL)
+       {
+               /* Give libxml a chance to clean up dangling pointers */
+               xmlCleanupParser();
+
+               /* And flush the context */
+               MemoryContextDelete(LibxmlContext);
+               LibxmlContext = NULL;
+       }
+}
 
 /*
  * Wrappers for memory management functions
@@ -1307,7 +1255,7 @@ xml_text2xmlChar(text *in)
 static void *
 xml_palloc(size_t size)
 {
-       return palloc(size);
+       return MemoryContextAlloc(LibxmlContext, size);
 }
 
 
@@ -1328,7 +1276,7 @@ xml_pfree(void *ptr)
 static char *
 xml_pstrdup(const char *string)
 {
-       return pstrdup(string);
+       return MemoryContextStrdup(LibxmlContext, string);
 }
 
 
@@ -1341,7 +1289,7 @@ xml_pstrdup(const char *string)
 static void
 xml_ereport(int level, int sqlcode, const char *msg)
 {
-       char *detail;
+       char       *detail;
 
        if (xml_err_buf->len > 0)
        {
@@ -1354,11 +1302,11 @@ xml_ereport(int level, int sqlcode, const char *msg)
        /* libxml error messages end in '\n'; get rid of it */
        if (detail)
        {
-               size_t len;
+               size_t          len;
 
                len = strlen(detail);
-               if (len > 0 && detail[len-1] == '\n')
-                       detail[len-1] = '\0';
+               if (len > 0 && detail[len - 1] == '\n')
+                       detail[len - 1] = '\0';
 
                ereport(level,
                                (errcode(sqlcode),
@@ -1411,30 +1359,30 @@ static void
 xml_ereport_by_code(int level, int sqlcode,
                                        const char *msg, int code)
 {
-    const char *det;
+       const char *det;
 
-    switch (code)
+       switch (code)
        {
                case XML_ERR_INVALID_CHAR:
-                       det = "Invalid character value";
+                       det = gettext_noop("Invalid character value.");
                        break;
                case XML_ERR_SPACE_REQUIRED:
-                       det = "Space required";
+                       det = gettext_noop("Space required.");
                        break;
                case XML_ERR_STANDALONE_VALUE:
-                       det = "standalone accepts only 'yes' or 'no'";
+                       det = gettext_noop("standalone accepts only 'yes' or 'no'.");
                        break;
                case XML_ERR_VERSION_MISSING:
-                       det = "Malformed declaration expecting version";
+                       det = gettext_noop("Malformed declaration: missing version.");
                        break;
                case XML_ERR_MISSING_ENCODING:
-                       det = "Missing encoding in text declaration";
+                       det = gettext_noop("Missing encoding in text declaration.");
                        break;
                case XML_ERR_XMLDECL_NOT_FINISHED:
-                       det = "Parsing XML declaration: '?>' expected";
+                       det = gettext_noop("Parsing XML declaration: '?>' expected.");
                        break;
-        default:
-            det = "Unrecognized libxml error code: %d";
+               default:
+                       det = gettext_noop("Unrecognized libxml error code: %d.");
                        break;
        }
 
@@ -1451,8 +1399,8 @@ xml_ereport_by_code(int level, int sqlcode,
 static pg_wchar
 sqlchar_to_unicode(char *s)
 {
-       char *utf8string;
-       pg_wchar ret[2];                        /* need space for trailing zero */
+       char       *utf8string;
+       pg_wchar        ret[2];                 /* need space for trailing zero */
 
        utf8string = (char *) pg_do_encoding_conversion((unsigned char *) s,
                                                                                                        pg_mblen(s),
@@ -1484,7 +1432,7 @@ is_valid_xml_namechar(pg_wchar c)
                        || xmlIsCombiningQ(c)
                        || xmlIsExtenderQ(c));
 }
-#endif /* USE_LIBXML */
+#endif   /* USE_LIBXML */
 
 
 /*
@@ -1496,11 +1444,11 @@ map_sql_identifier_to_xml_name(char *ident, bool fully_escaped,
 {
 #ifdef USE_LIBXML
        StringInfoData buf;
-       char *p;
+       char       *p;
 
        /*
-        * SQL/XML doesn't make use of this case anywhere, so it's
-        * probably a mistake.
+        * SQL/XML doesn't make use of this case anywhere, so it's probably a
+        * mistake.
         */
        Assert(fully_escaped || !escape_period);
 
@@ -1510,7 +1458,7 @@ map_sql_identifier_to_xml_name(char *ident, bool fully_escaped,
        {
                if (*p == ':' && (p == ident || fully_escaped))
                        appendStringInfo(&buf, "_x003A_");
-               else if (*p == '_' && *(p+1) == 'x')
+               else if (*p == '_' && *(p + 1) == 'x')
                        appendStringInfo(&buf, "_x005F_");
                else if (fully_escaped && p == ident &&
                                 pg_strncasecmp(p, "xml", 3) == 0)
@@ -1524,7 +1472,7 @@ map_sql_identifier_to_xml_name(char *ident, bool fully_escaped,
                        appendStringInfo(&buf, "_x002E_");
                else
                {
-                       pg_wchar u = sqlchar_to_unicode(p);
+                       pg_wchar        u = sqlchar_to_unicode(p);
 
                        if ((p == ident)
                                ? !is_valid_xml_namefirst(u)
@@ -1536,10 +1484,10 @@ map_sql_identifier_to_xml_name(char *ident, bool fully_escaped,
        }
 
        return buf.data;
-#else /* not USE_LIBXML */
+#else                                                  /* not USE_LIBXML */
        NO_XML_SUPPORT();
        return NULL;
-#endif /* not USE_LIBXML */
+#endif   /* not USE_LIBXML */
 }
 
 
@@ -1549,7 +1497,7 @@ map_sql_identifier_to_xml_name(char *ident, bool fully_escaped,
 static char *
 unicode_to_sqlchar(pg_wchar c)
 {
-       static unsigned char utf8string[5];     /* need trailing zero */
+       static unsigned char utf8string[5]; /* need trailing zero */
 
        if (c <= 0x7F)
        {
@@ -1588,18 +1536,18 @@ char *
 map_xml_name_to_sql_identifier(char *name)
 {
        StringInfoData buf;
-       char *p;
+       char       *p;
 
        initStringInfo(&buf);
 
        for (p = name; *p; p += pg_mblen(p))
        {
-               if (*p == '_' && *(p+1) == 'x'
-                       && isxdigit((unsigned char) *(p+2))
-                       && isxdigit((unsigned char) *(p+3))
-                       && isxdigit((unsigned char) *(p+4))
-                       && isxdigit((unsigned char) *(p+5))
-                       && *(p+6) == '_')
+               if (*p == '_' && *(p + 1) == 'x'
+                       && isxdigit((unsigned char) *(p + 2))
+                       && isxdigit((unsigned char) *(p + 3))
+                       && isxdigit((unsigned char) *(p + 4))
+                       && isxdigit((unsigned char) *(p + 5))
+                       && *(p + 6) == '_')
                {
                        unsigned int u;
 
@@ -1626,15 +1574,15 @@ map_sql_value_to_xml_value(Datum value, Oid type)
 
        if (type_is_array(type))
        {
-               ArrayType *array;
-               Oid elmtype;
-               int16 elmlen;
-               bool elmbyval;
-               char elmalign;
+               ArrayType  *array;
+               Oid                     elmtype;
+               int16           elmlen;
+               bool            elmbyval;
+               char            elmalign;
                int                     num_elems;
                Datum      *elem_values;
                bool       *elem_nulls;
-               int i;
+               int                     i;
 
                array = DatumGetArrayTypeP(value);
                elmtype = ARR_ELEMTYPE(array);
@@ -1661,9 +1609,10 @@ map_sql_value_to_xml_value(Datum value, Oid type)
        }
        else
        {
-               Oid typeOut;
-               bool isvarlena;
-               char *p, *str;
+               Oid                     typeOut;
+               bool            isvarlena;
+               char       *p,
+                                  *str;
 
                /*
                 * Special XSD formatting for some data types
@@ -1677,69 +1626,69 @@ map_sql_value_to_xml_value(Datum value, Oid type)
                                        return "false";
 
                        case DATEOID:
-                       {
-                               DateADT         date;
-                               struct pg_tm tm;
-                               char            buf[MAXDATELEN + 1];
+                               {
+                                       DateADT         date;
+                                       struct pg_tm tm;
+                                       char            buf[MAXDATELEN + 1];
 
-                               date = DatumGetDateADT(value);
-                               j2date(date + POSTGRES_EPOCH_JDATE,
-                                          &(tm.tm_year), &(tm.tm_mon), &(tm.tm_mday));
-                               EncodeDateOnly(&tm, USE_XSD_DATES, buf);
+                                       date = DatumGetDateADT(value);
+                                       j2date(date + POSTGRES_EPOCH_JDATE,
+                                                  &(tm.tm_year), &(tm.tm_mon), &(tm.tm_mday));
+                                       EncodeDateOnly(&tm, USE_XSD_DATES, buf);
 
-                               return pstrdup(buf);
-                       }
+                                       return pstrdup(buf);
+                               }
 
                        case TIMESTAMPOID:
-                       {
-                               Timestamp       timestamp;
-                               struct pg_tm tm;
-                               fsec_t          fsec;
-                               char       *tzn = NULL;
-                               char            buf[MAXDATELEN + 1];
-
-                               timestamp = DatumGetTimestamp(value);
-
-                               /* XSD doesn't support infinite values */
-                               if (TIMESTAMP_NOT_FINITE(timestamp))
-                                       ereport(ERROR,
-                                                       (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
-                                                        errmsg("timestamp out of range")));
-                               else if (timestamp2tm(timestamp, NULL, &tm, &fsec, NULL, NULL) == 0)
-                                       EncodeDateTime(&tm, fsec, NULL, &tzn, USE_XSD_DATES, buf);
-                               else
-                                       ereport(ERROR,
-                                                       (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
-                                                        errmsg("timestamp out of range")));
-
-                               return pstrdup(buf);
-                       }
+                               {
+                                       Timestamp       timestamp;
+                                       struct pg_tm tm;
+                                       fsec_t          fsec;
+                                       char       *tzn = NULL;
+                                       char            buf[MAXDATELEN + 1];
+
+                                       timestamp = DatumGetTimestamp(value);
+
+                                       /* XSD doesn't support infinite values */
+                                       if (TIMESTAMP_NOT_FINITE(timestamp))
+                                               ereport(ERROR,
+                                                               (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
+                                                                errmsg("timestamp out of range")));
+                                       else if (timestamp2tm(timestamp, NULL, &tm, &fsec, NULL, NULL) == 0)
+                                               EncodeDateTime(&tm, fsec, NULL, &tzn, USE_XSD_DATES, buf);
+                                       else
+                                               ereport(ERROR,
+                                                               (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
+                                                                errmsg("timestamp out of range")));
+
+                                       return pstrdup(buf);
+                               }
 
                        case TIMESTAMPTZOID:
-                       {
-                               TimestampTz     timestamp;
-                               struct pg_tm tm;
-                               int                     tz;
-                               fsec_t          fsec;
-                               char       *tzn = NULL;
-                               char            buf[MAXDATELEN + 1];
-
-                               timestamp = DatumGetTimestamp(value);
-
-                               /* XSD doesn't support infinite values */
-                               if (TIMESTAMP_NOT_FINITE(timestamp))
-                                       ereport(ERROR,
-                                                       (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
-                                                        errmsg("timestamp out of range")));
-                               else if (timestamp2tm(timestamp, &tz, &tm, &fsec, &tzn, NULL) == 0)
-                                       EncodeDateTime(&tm, fsec, &tz, &tzn, USE_XSD_DATES, buf);
-                               else
-                                       ereport(ERROR,
-                                                       (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
-                                                        errmsg("timestamp out of range")));
-
-                               return pstrdup(buf);
-                       }
+                               {
+                                       TimestampTz timestamp;
+                                       struct pg_tm tm;
+                                       int                     tz;
+                                       fsec_t          fsec;
+                                       char       *tzn = NULL;
+                                       char            buf[MAXDATELEN + 1];
+
+                                       timestamp = DatumGetTimestamp(value);
+
+                                       /* XSD doesn't support infinite values */
+                                       if (TIMESTAMP_NOT_FINITE(timestamp))
+                                               ereport(ERROR,
+                                                               (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
+                                                                errmsg("timestamp out of range")));
+                                       else if (timestamp2tm(timestamp, &tz, &tm, &fsec, &tzn, NULL) == 0)
+                                               EncodeDateTime(&tm, fsec, &tz, &tzn, USE_XSD_DATES, buf);
+                                       else
+                                               ereport(ERROR,
+                                                               (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
+                                                                errmsg("timestamp out of range")));
+
+                                       return pstrdup(buf);
+                               }
                }
 
                getTypeOutputInfo(type, &typeOut, &isvarlena);
@@ -1753,7 +1702,7 @@ map_sql_value_to_xml_value(Datum value, Oid type)
                {
                        xmlBufferPtr buf;
                        xmlTextWriterPtr writer;
-                       char *result;
+                       char       *result;
 
                        xml_init();
 
@@ -1770,7 +1719,7 @@ map_sql_value_to_xml_value(Datum value, Oid type)
                        xmlBufferFree(buf);
                        return result;
                }
-#endif /* USE_LIBXML */
+#endif   /* USE_LIBXML */
 
                for (p = str; *p; p += pg_mblen(p))
                {
@@ -1802,8 +1751,10 @@ map_sql_value_to_xml_value(Datum value, Oid type)
 static char *
 _SPI_strdup(const char *s)
 {
-       char *ret = SPI_palloc(strlen(s) + 1);
-       strcpy(ret, s);
+       size_t          len = strlen(s) + 1;
+       char       *ret = SPI_palloc(len);
+
+       memcpy(ret, s, len);
        return ret;
 }
 
@@ -1812,7 +1763,7 @@ _SPI_strdup(const char *s)
  * SQL to XML mapping functions
  *
  * What follows below is intentionally organized so that you can read
- * along in the SQL/XML:2003 standard.  The functions are mostly split
+ * along in the SQL/XML:2003 standard. The functions are mostly split
  * up and ordered they way the clauses lay out in the standards
  * document, and the identifiers are also aligned with the standard
  * text.  (SQL/XML:2006 appears to be ordered differently,
@@ -1822,13 +1773,13 @@ _SPI_strdup(const char *s)
  *
  * There are two kinds of mappings: Mapping SQL data (table contents)
  * to XML documents, and mapping SQL structure (the "schema") to XML
- * Schema.  And there are functions that do both at the same time.
+ * Schema.     And there are functions that do both at the same time.
  *
  * Then you can map a database, a schema, or a table, each in both
  * ways.  This breaks down recursively: Mapping a database invokes
  * mapping schemas, which invokes mapping tables, which invokes
  * mapping rows, which invokes mapping columns, although you can't
- * call the last two from the outside.  Because of this, there are a
+ * call the last two from the outside. Because of this, there are a
  * number of xyz_internal() functions which are to be called both from
  * the function manager wrapper and from some upper layer in a
  * recursive call.
@@ -1837,7 +1788,7 @@ _SPI_strdup(const char *s)
  * nulls, tableforest, and targetns mean.
  *
  * Some style guidelines for XML output: Use double quotes for quoting
- * XML attributes.  Indent XML elements by two spaces, but remember
+ * XML attributes.     Indent XML elements by two spaces, but remember
  * that a lot of code is called recursively at different levels, so
  * it's better not to indent rather than create output that indents
  * and outdents weirdly.  Add newlines to make the output look nice.
@@ -1863,8 +1814,8 @@ query_to_oid_list(const char *query)
 
        for (i = 0; i < SPI_processed; i++)
        {
-               Datum oid;
-               bool isnull;
+               Datum           oid;
+               bool            isnull;
 
                oid = SPI_getbinval(SPI_tuptable->vals[i],
                                                        SPI_tuptable->tupdesc,
@@ -1890,7 +1841,7 @@ schema_get_xml_visible_tables(Oid nspid)
 }
 
 
-/* 
+/*
  * Including the system schemas is probably not useful for a database
  * mapping.
  */
@@ -1929,7 +1880,7 @@ table_to_xml_internal(Oid relid,
        initStringInfo(&query);
        appendStringInfo(&query, "SELECT * FROM %s",
                                         DatumGetCString(DirectFunctionCall1(regclassout,
-                                                                                               ObjectIdGetDatum(relid))));
+                                                                                                 ObjectIdGetDatum(relid))));
        return query_to_xml_internal(query.data, get_rel_name(relid),
                                                                 xmlschema, nulls, tableforest,
                                                                 targetns, top_level);
@@ -1942,36 +1893,36 @@ table_to_xml(PG_FUNCTION_ARGS)
        Oid                     relid = PG_GETARG_OID(0);
        bool            nulls = PG_GETARG_BOOL(1);
        bool            tableforest = PG_GETARG_BOOL(2);
-       const char *targetns = _textout(PG_GETARG_TEXT_P(3));
+       const char *targetns = text_to_cstring(PG_GETARG_TEXT_PP(3));
 
        PG_RETURN_XML_P(stringinfo_to_xmltype(table_to_xml_internal(relid, NULL,
-                                                                                                               nulls, tableforest,
-                                                                                                               targetns, true)));
+                                                                                                                 nulls, tableforest,
+                                                                                                                  targetns, true)));
 }
 
 
 Datum
 query_to_xml(PG_FUNCTION_ARGS)
 {
-       char       *query = _textout(PG_GETARG_TEXT_P(0));
+       char       *query = text_to_cstring(PG_GETARG_TEXT_PP(0));
        bool            nulls = PG_GETARG_BOOL(1);
        bool            tableforest = PG_GETARG_BOOL(2);
-       const char *targetns = _textout(PG_GETARG_TEXT_P(3));
+       const char *targetns = text_to_cstring(PG_GETARG_TEXT_PP(3));
 
        PG_RETURN_XML_P(stringinfo_to_xmltype(query_to_xml_internal(query, NULL,
                                                                                                        NULL, nulls, tableforest,
-                                                                                                       targetns, true)));
+                                                                                                                  targetns, true)));
 }
 
 
 Datum
 cursor_to_xml(PG_FUNCTION_ARGS)
 {
-       char       *name = _textout(PG_GETARG_TEXT_P(0));
+       char       *name = text_to_cstring(PG_GETARG_TEXT_PP(0));
        int32           count = PG_GETARG_INT32(1);
        bool            nulls = PG_GETARG_BOOL(2);
        bool            tableforest = PG_GETARG_BOOL(3);
-       const char *targetns = _textout(PG_GETARG_TEXT_P(4));
+       const char *targetns = text_to_cstring(PG_GETARG_TEXT_PP(4));
 
        StringInfoData result;
        Portal          portal;
@@ -2001,12 +1952,12 @@ cursor_to_xml(PG_FUNCTION_ARGS)
  * Write the start tag of the root element of a data mapping.
  *
  * top_level means that this is the very top level of the eventual
- * output.  For example, when the user calls table_to_xml, then a call
+ * output.     For example, when the user calls table_to_xml, then a call
  * with a table name to this function is the top level.  When the user
  * calls database_to_xml, then a call with a schema name to this
  * function is not the top level.  If top_level is false, then the XML
  * namespace declarations are omitted, because they supposedly already
- * appeared earlier in the output.  Repeating them is not wrong, but
+ * appeared earlier in the output.     Repeating them is not wrong, but
  * it looks ugly.
  */
 static void
@@ -2072,7 +2023,7 @@ query_to_xml_internal(const char *query, char *tablename,
        if (xmlschema)
                appendStringInfo(result, "%s\n\n", xmlschema);
 
-       for(i = 0; i < SPI_processed; i++)
+       for (i = 0; i < SPI_processed; i++)
                SPI_sql_row_to_xmlelement(i, result, tablename, nulls,
                                                                  tableforest, targetns, top_level);
 
@@ -2091,9 +2042,9 @@ table_to_xmlschema(PG_FUNCTION_ARGS)
        Oid                     relid = PG_GETARG_OID(0);
        bool            nulls = PG_GETARG_BOOL(1);
        bool            tableforest = PG_GETARG_BOOL(2);
-       const char *targetns = _textout(PG_GETARG_TEXT_P(3));
+       const char *targetns = text_to_cstring(PG_GETARG_TEXT_PP(3));
        const char *result;
-       Relation rel;
+       Relation        rel;
 
        rel = heap_open(relid, AccessShareLock);
        result = map_sql_table_to_xmlschema(rel->rd_att, relid, nulls,
@@ -2107,17 +2058,22 @@ table_to_xmlschema(PG_FUNCTION_ARGS)
 Datum
 query_to_xmlschema(PG_FUNCTION_ARGS)
 {
-       char       *query = _textout(PG_GETARG_TEXT_P(0));
+       char       *query = text_to_cstring(PG_GETARG_TEXT_PP(0));
        bool            nulls = PG_GETARG_BOOL(1);
        bool            tableforest = PG_GETARG_BOOL(2);
-       const char *targetns = _textout(PG_GETARG_TEXT_P(3));
+       const char *targetns = text_to_cstring(PG_GETARG_TEXT_PP(3));
        const char *result;
        SPIPlanPtr      plan;
        Portal          portal;
 
        SPI_connect();
-       plan = SPI_prepare(query, 0, NULL);
-       portal = SPI_cursor_open(NULL, plan, NULL, NULL, true);
+
+       if ((plan = SPI_prepare(query, 0, NULL)) == NULL)
+               elog(ERROR, "SPI_prepare(\"%s\") failed", query);
+
+       if ((portal = SPI_cursor_open(NULL, plan, NULL, NULL, true)) == NULL)
+               elog(ERROR, "SPI_cursor_open(\"%s\") failed", query);
+
        result = _SPI_strdup(map_sql_table_to_xmlschema(portal->tupDesc,
                                                                                                        InvalidOid, nulls,
                                                                                                        tableforest, targetns));
@@ -2131,10 +2087,10 @@ query_to_xmlschema(PG_FUNCTION_ARGS)
 Datum
 cursor_to_xmlschema(PG_FUNCTION_ARGS)
 {
-       char       *name = _textout(PG_GETARG_TEXT_P(0));
+       char       *name = text_to_cstring(PG_GETARG_TEXT_PP(0));
        bool            nulls = PG_GETARG_BOOL(1);
        bool            tableforest = PG_GETARG_BOOL(2);
-       const char *targetns = _textout(PG_GETARG_TEXT_P(3));
+       const char *targetns = text_to_cstring(PG_GETARG_TEXT_PP(3));
        const char *xmlschema;
        Portal          portal;
 
@@ -2147,7 +2103,7 @@ cursor_to_xmlschema(PG_FUNCTION_ARGS)
 
        xmlschema = _SPI_strdup(map_sql_table_to_xmlschema(portal->tupDesc,
                                                                                                           InvalidOid, nulls,
-                                                                                                          tableforest, targetns));
+                                                                                                        tableforest, targetns));
        SPI_finish();
 
        PG_RETURN_XML_P(cstring_to_xmltype(xmlschema));
@@ -2160,7 +2116,7 @@ table_to_xml_and_xmlschema(PG_FUNCTION_ARGS)
        Oid                     relid = PG_GETARG_OID(0);
        bool            nulls = PG_GETARG_BOOL(1);
        bool            tableforest = PG_GETARG_BOOL(2);
-       const char *targetns = _textout(PG_GETARG_TEXT_P(3));
+       const char *targetns = text_to_cstring(PG_GETARG_TEXT_PP(3));
        Relation        rel;
        const char *xmlschema;
 
@@ -2170,34 +2126,39 @@ table_to_xml_and_xmlschema(PG_FUNCTION_ARGS)
        heap_close(rel, NoLock);
 
        PG_RETURN_XML_P(stringinfo_to_xmltype(table_to_xml_internal(relid,
-                                                                                       xmlschema, nulls, tableforest,
-                                                                                       targetns, true)));
+                                                                                          xmlschema, nulls, tableforest,
+                                                                                                                  targetns, true)));
 }
 
 
 Datum
 query_to_xml_and_xmlschema(PG_FUNCTION_ARGS)
 {
-       char       *query = _textout(PG_GETARG_TEXT_P(0));
+       char       *query = text_to_cstring(PG_GETARG_TEXT_PP(0));
        bool            nulls = PG_GETARG_BOOL(1);
        bool            tableforest = PG_GETARG_BOOL(2);
-       const char *targetns = _textout(PG_GETARG_TEXT_P(3));
+       const char *targetns = text_to_cstring(PG_GETARG_TEXT_PP(3));
 
        const char *xmlschema;
        SPIPlanPtr      plan;
        Portal          portal;
 
        SPI_connect();
-       plan = SPI_prepare(query, 0, NULL);
-       portal = SPI_cursor_open(NULL, plan, NULL, NULL, true);
+
+       if ((plan = SPI_prepare(query, 0, NULL)) == NULL)
+               elog(ERROR, "SPI_prepare(\"%s\") failed", query);
+
+       if ((portal = SPI_cursor_open(NULL, plan, NULL, NULL, true)) == NULL)
+               elog(ERROR, "SPI_cursor_open(\"%s\") failed", query);
+
        xmlschema = _SPI_strdup(map_sql_table_to_xmlschema(portal->tupDesc,
-                                                                  InvalidOid, nulls, tableforest, targetns));
+                                                                 InvalidOid, nulls, tableforest, targetns));
        SPI_cursor_close(portal);
        SPI_finish();
 
        PG_RETURN_XML_P(stringinfo_to_xmltype(query_to_xml_internal(query, NULL,
-                                                                       xmlschema, nulls, tableforest,
-                                                                       targetns, true)));
+                                                                                          xmlschema, nulls, tableforest,
+                                                                                                                  targetns, true)));
 }
 
 
@@ -2232,8 +2193,8 @@ schema_to_xml_internal(Oid nspid, const char *xmlschema, bool nulls,
 
        foreach(cell, relid_list)
        {
-               Oid relid = lfirst_oid(cell);
-               StringInfo subres;
+               Oid                     relid = lfirst_oid(cell);
+               StringInfo      subres;
 
                subres = table_to_xml_internal(relid, NULL, nulls, tableforest,
                                                                           targetns, false);
@@ -2257,7 +2218,7 @@ schema_to_xml(PG_FUNCTION_ARGS)
        Name            name = PG_GETARG_NAME(0);
        bool            nulls = PG_GETARG_BOOL(1);
        bool            tableforest = PG_GETARG_BOOL(2);
-       const char *targetns = _textout(PG_GETARG_TEXT_P(3));
+       const char *targetns = text_to_cstring(PG_GETARG_TEXT_PP(3));
 
        char       *schemaname;
        Oid                     nspid;
@@ -2266,7 +2227,7 @@ schema_to_xml(PG_FUNCTION_ARGS)
        nspid = LookupExplicitNamespace(schemaname);
 
        PG_RETURN_XML_P(stringinfo_to_xmltype(schema_to_xml_internal(nspid, NULL,
-                                                                                nulls, tableforest, targetns, true)));
+                                                                          nulls, tableforest, targetns, true)));
 }
 
 
@@ -2318,9 +2279,9 @@ schema_to_xmlschema_internal(const char *schemaname, bool nulls,
        relid_list = schema_get_xml_visible_tables(nspid);
 
        tupdesc_list = NIL;
-       foreach (cell, relid_list)
+       foreach(cell, relid_list)
        {
-               Relation rel;
+               Relation        rel;
 
                rel = heap_open(lfirst_oid(cell), AccessShareLock);
                tupdesc_list = lappend(tupdesc_list, CreateTupleDescCopy(rel->rd_att));
@@ -2331,8 +2292,8 @@ schema_to_xmlschema_internal(const char *schemaname, bool nulls,
                                                   map_sql_typecoll_to_xmlschema_types(tupdesc_list));
 
        appendStringInfoString(result,
-                                                  map_sql_schema_to_xmlschema_types(nspid, relid_list,
-                                                                                                                        nulls, tableforest, targetns));
+                                                map_sql_schema_to_xmlschema_types(nspid, relid_list,
+                                                                                         nulls, tableforest, targetns));
 
        xsd_schema_element_end(result);
 
@@ -2348,10 +2309,10 @@ schema_to_xmlschema(PG_FUNCTION_ARGS)
        Name            name = PG_GETARG_NAME(0);
        bool            nulls = PG_GETARG_BOOL(1);
        bool            tableforest = PG_GETARG_BOOL(2);
-       const char *targetns = _textout(PG_GETARG_TEXT_P(3));
+       const char *targetns = text_to_cstring(PG_GETARG_TEXT_PP(3));
 
        PG_RETURN_XML_P(stringinfo_to_xmltype(schema_to_xmlschema_internal(NameStr(*name),
-                                                                                          nulls, tableforest, targetns)));
+                                                                                        nulls, tableforest, targetns)));
 }
 
 
@@ -2361,7 +2322,7 @@ schema_to_xml_and_xmlschema(PG_FUNCTION_ARGS)
        Name            name = PG_GETARG_NAME(0);
        bool            nulls = PG_GETARG_BOOL(1);
        bool            tableforest = PG_GETARG_BOOL(2);
-       const char *targetns = _textout(PG_GETARG_TEXT_P(3));
+       const char *targetns = text_to_cstring(PG_GETARG_TEXT_PP(3));
        char       *schemaname;
        Oid                     nspid;
        StringInfo      xmlschema;
@@ -2373,8 +2334,8 @@ schema_to_xml_and_xmlschema(PG_FUNCTION_ARGS)
                                                                                         tableforest, targetns);
 
        PG_RETURN_XML_P(stringinfo_to_xmltype(schema_to_xml_internal(nspid,
-                                                                                        xmlschema->data, nulls,
-                                                                                        tableforest, targetns, true)));
+                                                                                                         xmlschema->data, nulls,
+                                                                                         tableforest, targetns, true)));
 }
 
 
@@ -2409,8 +2370,8 @@ database_to_xml_internal(const char *xmlschema, bool nulls,
 
        foreach(cell, nspid_list)
        {
-               Oid nspid = lfirst_oid(cell);
-               StringInfo subres;
+               Oid                     nspid = lfirst_oid(cell);
+               StringInfo      subres;
 
                subres = schema_to_xml_internal(nspid, NULL, nulls,
                                                                                tableforest, targetns, false);
@@ -2433,10 +2394,10 @@ database_to_xml(PG_FUNCTION_ARGS)
 {
        bool            nulls = PG_GETARG_BOOL(0);
        bool            tableforest = PG_GETARG_BOOL(1);
-       const char *targetns = _textout(PG_GETARG_TEXT_P(2));
+       const char *targetns = text_to_cstring(PG_GETARG_TEXT_PP(2));
 
        PG_RETURN_XML_P(stringinfo_to_xmltype(database_to_xml_internal(NULL, nulls,
-                                                                                                  tableforest, targetns)));
+                                                                                                       tableforest, targetns)));
 }
 
 
@@ -2460,9 +2421,9 @@ database_to_xmlschema_internal(bool nulls, bool tableforest,
        nspid_list = database_get_xml_visible_schemas();
 
        tupdesc_list = NIL;
-       foreach (cell, relid_list)
+       foreach(cell, relid_list)
        {
-               Relation rel;
+               Relation        rel;
 
                rel = heap_open(lfirst_oid(cell), AccessShareLock);
                tupdesc_list = lappend(tupdesc_list, CreateTupleDescCopy(rel->rd_att));
@@ -2488,10 +2449,10 @@ database_to_xmlschema(PG_FUNCTION_ARGS)
 {
        bool            nulls = PG_GETARG_BOOL(0);
        bool            tableforest = PG_GETARG_BOOL(1);
-       const char *targetns = _textout(PG_GETARG_TEXT_P(2));
+       const char *targetns = text_to_cstring(PG_GETARG_TEXT_PP(2));
 
        PG_RETURN_XML_P(stringinfo_to_xmltype(database_to_xmlschema_internal(nulls,
-                                                                                                        tableforest, targetns)));
+                                                                                                       tableforest, targetns)));
 }
 
 
@@ -2500,13 +2461,13 @@ database_to_xml_and_xmlschema(PG_FUNCTION_ARGS)
 {
        bool            nulls = PG_GETARG_BOOL(0);
        bool            tableforest = PG_GETARG_BOOL(1);
-       const char *targetns = _textout(PG_GETARG_TEXT_P(2));
+       const char *targetns = text_to_cstring(PG_GETARG_TEXT_PP(2));
        StringInfo      xmlschema;
 
        xmlschema = database_to_xmlschema_internal(nulls, tableforest, targetns);
 
        PG_RETURN_XML_P(stringinfo_to_xmltype(database_to_xml_internal(xmlschema->data,
-                                                                                          nulls, tableforest, targetns)));
+                                                                                        nulls, tableforest, targetns)));
 }
 
 
@@ -2559,7 +2520,7 @@ map_sql_table_to_xmlschema(TupleDesc tupdesc, Oid relid, bool nulls,
 
        if (OidIsValid(relid))
        {
-               HeapTuple tuple;
+               HeapTuple       tuple;
                Form_pg_class reltuple;
 
                tuple = SearchSysCache(RELOID,
@@ -2573,14 +2534,14 @@ map_sql_table_to_xmlschema(TupleDesc tupdesc, Oid relid, bool nulls,
                                                                                           true, false);
 
                tabletypename = map_multipart_sql_identifier_to_xml_name("TableType",
-                                                                                                                                get_database_name(MyDatabaseId),
-                                                                                                                                get_namespace_name(reltuple->relnamespace),
-                                                                                                                                NameStr(reltuple->relname));
+                                                                                        get_database_name(MyDatabaseId),
+                                                                 get_namespace_name(reltuple->relnamespace),
+                                                                                                NameStr(reltuple->relname));
 
                rowtypename = map_multipart_sql_identifier_to_xml_name("RowType",
-                                                                                                                          get_database_name(MyDatabaseId),
-                                                                                                                          get_namespace_name(reltuple->relnamespace),
-                                                                                                                          NameStr(reltuple->relname));
+                                                                                        get_database_name(MyDatabaseId),
+                                                                 get_namespace_name(reltuple->relnamespace),
+                                                                                                NameStr(reltuple->relname));
 
                ReleaseSysCache(tuple);
        }
@@ -2598,7 +2559,7 @@ map_sql_table_to_xmlschema(TupleDesc tupdesc, Oid relid, bool nulls,
        xsd_schema_element_start(&result, targetns);
 
        appendStringInfoString(&result,
-                                                  map_sql_typecoll_to_xmlschema_types(list_make1(tupdesc)));
+                                  map_sql_typecoll_to_xmlschema_types(list_make1(tupdesc)));
 
        appendStringInfo(&result,
                                         "<xsd:complexType name=\"%s\">\n"
@@ -2607,10 +2568,10 @@ map_sql_table_to_xmlschema(TupleDesc tupdesc, Oid relid, bool nulls,
 
        for (i = 0; i < tupdesc->natts; i++)
                appendStringInfo(&result,
-                                                "    <xsd:element name=\"%s\" type=\"%s\"%s></xsd:element>\n",
-                                                map_sql_identifier_to_xml_name(NameStr(tupdesc->attrs[i]->attname),
-                                                                                                               true, false),
-                                                map_sql_type_to_xml_name(tupdesc->attrs[i]->atttypid, -1),
+                          "    <xsd:element name=\"%s\" type=\"%s\"%s></xsd:element>\n",
+                 map_sql_identifier_to_xml_name(NameStr(tupdesc->attrs[i]->attname),
+                                                                                true, false),
+                                  map_sql_type_to_xml_name(tupdesc->attrs[i]->atttypid, -1),
                                                 nulls ? " nillable=\"true\"" : " minOccurs=\"0\"");
 
        appendStringInfoString(&result,
@@ -2678,23 +2639,23 @@ map_sql_schema_to_xmlschema_types(Oid nspid, List *relid_list, bool nulls,
                appendStringInfoString(&result,
                                                           "  <xsd:sequence>\n");
 
-       foreach (cell, relid_list)
+       foreach(cell, relid_list)
        {
-               Oid relid = lfirst_oid(cell);
-               char *relname = get_rel_name(relid);
-               char *xmltn = map_sql_identifier_to_xml_name(relname, true, false);
-               char *tabletypename = map_multipart_sql_identifier_to_xml_name(tableforest ? "RowType" : "TableType",
-                                                                                                                                          dbname,
-                                                                                                                                          nspname,
-                                                                                                                                          relname);
+               Oid                     relid = lfirst_oid(cell);
+               char       *relname = get_rel_name(relid);
+               char       *xmltn = map_sql_identifier_to_xml_name(relname, true, false);
+               char       *tabletypename = map_multipart_sql_identifier_to_xml_name(tableforest ? "RowType" : "TableType",
+                                                                                                                                         dbname,
+                                                                                                                                        nspname,
+                                                                                                                                       relname);
 
                if (!tableforest)
                        appendStringInfo(&result,
-                                                        "    <xsd:element name=\"%s\" type=\"%s\" />\n",
+                                                        "    <xsd:element name=\"%s\" type=\"%s\"/>\n",
                                                         xmltn, tabletypename);
                else
                        appendStringInfo(&result,
-                                                        "    <xsd:element name=\"%s\" type=\"%s\" minOccurs=\"0\" maxOccurs=\"unbounded\" />\n",
+                                                        "    <xsd:element name=\"%s\" type=\"%s\" minOccurs=\"0\" maxOccurs=\"unbounded\"/>\n",
                                                         xmltn, tabletypename);
        }
 
@@ -2745,18 +2706,18 @@ map_sql_catalog_to_xmlschema_types(List *nspid_list, bool nulls,
        appendStringInfoString(&result,
                                                   "  <xsd:all>\n");
 
-       foreach (cell, nspid_list)
+       foreach(cell, nspid_list)
        {
-               Oid nspid = lfirst_oid(cell);
+               Oid                     nspid = lfirst_oid(cell);
                char       *nspname = get_namespace_name(nspid);
-               char *xmlsn = map_sql_identifier_to_xml_name(nspname, true, false);
-               char *schematypename = map_multipart_sql_identifier_to_xml_name("SchemaType",
-                                                                                                                                               dbname,
-                                                                                                                                               nspname,
-                                                                                                                                               NULL);
+               char       *xmlsn = map_sql_identifier_to_xml_name(nspname, true, false);
+               char       *schematypename = map_multipart_sql_identifier_to_xml_name("SchemaType",
+                                                                                                                                         dbname,
+                                                                                                                                        nspname,
+                                                                                                                                          NULL);
 
                appendStringInfo(&result,
-                                                "    <xsd:element name=\"%s\" type=\"%s\" />\n",
+                                                "    <xsd:element name=\"%s\" type=\"%s\"/>\n",
                                                 xmlsn, schematypename);
        }
 
@@ -2783,7 +2744,7 @@ map_sql_type_to_xml_name(Oid typeoid, int typmod)
 
        initStringInfo(&result);
 
-       switch(typeoid)
+       switch (typeoid)
        {
                case BPCHAROID:
                        if (typmod == -1)
@@ -2854,25 +2815,25 @@ map_sql_type_to_xml_name(Oid typeoid, int typmod)
                        appendStringInfo(&result, "XML");
                        break;
                default:
-               {
-                       HeapTuple tuple;
-                       Form_pg_type typtuple;
-
-                       tuple = SearchSysCache(TYPEOID,
-                                                                  ObjectIdGetDatum(typeoid),
-                                                                  0, 0, 0);
-                       if (!HeapTupleIsValid(tuple))
-                               elog(ERROR, "cache lookup failed for type %u", typeoid);
-                       typtuple = (Form_pg_type) GETSTRUCT(tuple);
-
-                       appendStringInfoString(&result,
-                                                                  map_multipart_sql_identifier_to_xml_name((typtuple->typtype == TYPTYPE_DOMAIN) ? "Domain" : "UDT",
-                                                                                                                                                       get_database_name(MyDatabaseId),
-                                                                                                                                                       get_namespace_name(typtuple->typnamespace),
-                                                                                                                                                       NameStr(typtuple->typname)));
-
-                       ReleaseSysCache(tuple);
-               }
+                       {
+                               HeapTuple       tuple;
+                               Form_pg_type typtuple;
+
+                               tuple = SearchSysCache(TYPEOID,
+                                                                          ObjectIdGetDatum(typeoid),
+                                                                          0, 0, 0);
+                               if (!HeapTupleIsValid(tuple))
+                                       elog(ERROR, "cache lookup failed for type %u", typeoid);
+                               typtuple = (Form_pg_type) GETSTRUCT(tuple);
+
+                               appendStringInfoString(&result,
+                                                                          map_multipart_sql_identifier_to_xml_name((typtuple->typtype == TYPTYPE_DOMAIN) ? "Domain" : "UDT",
+                                                                                        get_database_name(MyDatabaseId),
+                                                                 get_namespace_name(typtuple->typnamespace),
+                                                                                               NameStr(typtuple->typname)));
+
+                               ReleaseSysCache(tuple);
+                       }
        }
 
        return result.data;
@@ -2894,7 +2855,7 @@ map_sql_typecoll_to_xmlschema_types(List *tupdesc_list)
        /* extract all column types used in the set of TupleDescs */
        foreach(cell0, tupdesc_list)
        {
-               TupleDesc tupdesc = (TupleDesc) lfirst(cell0);
+               TupleDesc       tupdesc = (TupleDesc) lfirst(cell0);
 
                for (i = 0; i < tupdesc->natts; i++)
                {
@@ -2908,8 +2869,8 @@ map_sql_typecoll_to_xmlschema_types(List *tupdesc_list)
        /* add base types of domains */
        foreach(cell0, uniquetypes)
        {
-               Oid typid = lfirst_oid(cell0);
-               Oid basetypid = getBaseType(typid);
+               Oid                     typid = lfirst_oid(cell0);
+               Oid                     basetypid = getBaseType(typid);
 
                if (basetypid != typid)
                        uniquetypes = list_append_unique_oid(uniquetypes, basetypid);
@@ -2934,7 +2895,7 @@ map_sql_typecoll_to_xmlschema_types(List *tupdesc_list)
  * sections 9.11 and 9.15.
  *
  * (The distinction between 9.11 and 9.15 is basically that 9.15 adds
- * a name attribute, which this function does.  The name-less version
+ * a name attribute, which this function does. The name-less version
  * 9.11 doesn't appear to be required anywhere.)
  */
 static const char *
@@ -2959,31 +2920,34 @@ map_sql_type_to_xmlschema_type(Oid typeoid, int typmod)
                appendStringInfo(&result,
                                                 "<xsd:simpleType name=\"%s\">\n", typename);
 
-               switch(typeoid)
+               switch (typeoid)
                {
                        case BPCHAROID:
                        case VARCHAROID:
                        case TEXTOID:
+                               appendStringInfo(&result,
+                                                                "  <xsd:restriction base=\"xsd:string\">\n");
                                if (typmod != -1)
                                        appendStringInfo(&result,
-                                                                        "  <xsd:restriction base=\"xsd:string\">\n"
-                                                                        "    <xsd:maxLength value=\"%d\"/>\n"
-                                                                        "  </xsd:restriction>\n",
+                                                                        "    <xsd:maxLength value=\"%d\"/>\n",
                                                                         typmod - VARHDRSZ);
+                               appendStringInfo(&result,
+                                                                "  </xsd:restriction>\n");
                                break;
 
                        case BYTEAOID:
                                appendStringInfo(&result,
                                                                 "  <xsd:restriction base=\"xsd:%s\">\n"
                                                                 "  </xsd:restriction>\n",
-                                                                xmlbinary == XMLBINARY_BASE64 ? "base64Binary" : "hexBinary");
+                               xmlbinary == XMLBINARY_BASE64 ? "base64Binary" : "hexBinary");
+                               break;
 
                        case NUMERICOID:
                                if (typmod != -1)
                                        appendStringInfo(&result,
-                                                                        "  <xsd:restriction base=\"xsd:decimal\">\n"
+                                                                "  <xsd:restriction base=\"xsd:decimal\">\n"
                                                                         "    <xsd:totalDigits value=\"%d\"/>\n"
-                                                                        "    <xsd:fractionDigits value=\"%d\"/>\n"
+                                                                  "    <xsd:fractionDigits value=\"%d\"/>\n"
                                                                         "  </xsd:restriction>\n",
                                                                         ((typmod - VARHDRSZ) >> 16) & 0xffff,
                                                                         (typmod - VARHDRSZ) & 0xffff);
@@ -3000,7 +2964,7 @@ map_sql_type_to_xmlschema_type(Oid typeoid, int typmod)
 
                        case INT4OID:
                                appendStringInfo(&result,
-                                                                "  <xsd:restriction base='xsd:int'>\n"
+                                                                "  <xsd:restriction base=\"xsd:int\">\n"
                                                                 "    <xsd:maxInclusive value=\"%d\"/>\n"
                                                                 "    <xsd:minInclusive value=\"%d\"/>\n"
                                                                 "  </xsd:restriction>\n",
@@ -3010,16 +2974,16 @@ map_sql_type_to_xmlschema_type(Oid typeoid, int typmod)
                        case INT8OID:
                                appendStringInfo(&result,
                                                                 "  <xsd:restriction base=\"xsd:long\">\n"
-                                                                "    <xsd:maxInclusive value=\"" INT64_FORMAT "\"/>\n"
-                                                                "    <xsd:minInclusive value=\"" INT64_FORMAT "\"/>\n"
+                                          "    <xsd:maxInclusive value=\"" INT64_FORMAT "\"/>\n"
+                                          "    <xsd:minInclusive value=\"" INT64_FORMAT "\"/>\n"
                                                                 "  </xsd:restriction>\n",
-                                                                (((uint64) 1) << (sizeof(int64) * 8 - 1)) - 1,
+                                                          (((uint64) 1) << (sizeof(int64) * 8 - 1)) - 1,
                                                                 (((uint64) 1) << (sizeof(int64) * 8 - 1)));
                                break;
 
                        case FLOAT4OID:
                                appendStringInfo(&result,
-                                                                "  <xsd:restriction base=\"xsd:float\"></xsd:restriction>\n");
+                               "  <xsd:restriction base=\"xsd:float\"></xsd:restriction>\n");
                                break;
 
                        case FLOAT8OID:
@@ -3034,49 +2998,49 @@ map_sql_type_to_xmlschema_type(Oid typeoid, int typmod)
 
                        case TIMEOID:
                        case TIMETZOID:
-                       {
-                               const char *tz = (typeoid == TIMETZOID ? "(+|-)\\p{Nd}{2}:\\p{Nd}{2}" : "");
-
-                               if (typmod == -1)
-                                       appendStringInfo(&result,
-                                                                        "  <xsd:restriction base=\"xsd:time\">\n"
-                                                                        "    <xsd:pattern value=\"\\p{Nd}{2}:\\p{Nd}{2}:\\p{Nd}{2}(.\\p{Nd}+)?%s\"/>\n"
-                                                                        "  </xsd:restriction>\n", tz);
-                               else if (typmod == 0)
-                                       appendStringInfo(&result,
-                                                                        "  <xsd:restriction base=\"xsd:time\">\n"
-                                                                        "    <xsd:pattern value=\"\\p{Nd}{2}:\\p{Nd}{2}:\\p{Nd}{2}%s\"/>\n"
-                                                                        "  </xsd:restriction>\n", tz);
-                               else
-                                       appendStringInfo(&result,
-                                                                        "  <xsd:restriction base=\"xsd:time\">\n"
-                                                                        "    <xsd:pattern value=\"\\p{Nd}{2}:\\p{Nd}{2}:\\p{Nd}{2}.\\p{Nd}{%d}%s\"/>\n"
-                                                                        "  </xsd:restriction>\n", typmod - VARHDRSZ, tz);
-                               break;
-                       }
+                               {
+                                       const char *tz = (typeoid == TIMETZOID ? "(+|-)\\p{Nd}{2}:\\p{Nd}{2}" : "");
+
+                                       if (typmod == -1)
+                                               appendStringInfo(&result,
+                                                                       "  <xsd:restriction base=\"xsd:time\">\n"
+                                                                                "    <xsd:pattern value=\"\\p{Nd}{2}:\\p{Nd}{2}:\\p{Nd}{2}(.\\p{Nd}+)?%s\"/>\n"
+                                                                                "  </xsd:restriction>\n", tz);
+                                       else if (typmod == 0)
+                                               appendStringInfo(&result,
+                                                                       "  <xsd:restriction base=\"xsd:time\">\n"
+                                                                                "    <xsd:pattern value=\"\\p{Nd}{2}:\\p{Nd}{2}:\\p{Nd}{2}%s\"/>\n"
+                                                                                "  </xsd:restriction>\n", tz);
+                                       else
+                                               appendStringInfo(&result,
+                                                                       "  <xsd:restriction base=\"xsd:time\">\n"
+                                                                                "    <xsd:pattern value=\"\\p{Nd}{2}:\\p{Nd}{2}:\\p{Nd}{2}.\\p{Nd}{%d}%s\"/>\n"
+                                                       "  </xsd:restriction>\n", typmod - VARHDRSZ, tz);
+                                       break;
+                               }
 
                        case TIMESTAMPOID:
                        case TIMESTAMPTZOID:
-                       {
-                               const char *tz = (typeoid == TIMESTAMPTZOID ? "(+|-)\\p{Nd}{2}:\\p{Nd}{2}" : "");
-
-                               if (typmod == -1)
-                                       appendStringInfo(&result,
-                                                                        "  <xsd:restriction base=\"xsd:dateTime\">\n"
-                                                                        "    <xsd:pattern value=\"\\p{Nd}{4}-\\p{Nd}{2}-\\p{Nd}{2}T\\p{Nd}{2}:\\p{Nd}{2}:\\p{Nd}{2}(.\\p{Nd}+)?%s\"/>\n"
-                                                                        "  </xsd:restriction>\n", tz);
-                               else if (typmod == 0)
-                                       appendStringInfo(&result,
-                                                                        "  <xsd:restriction base=\"xsd:dateTime\">\n"
-                                                                        "    <xsd:pattern value=\"\\p{Nd}{4}-\\p{Nd}{2}-\\p{Nd}{2}T\\p{Nd}{2}:\\p{Nd}{2}:\\p{Nd}{2}%s\"/>\n"
-                                                                        "  </xsd:restriction>\n", tz);
-                               else
-                                       appendStringInfo(&result,
-                                                                        "  <xsd:restriction base=\"xsd:dateTime\">\n"
-                                                                        "    <xsd:pattern value=\"\\p{Nd}{4}-\\p{Nd}{2}-\\p{Nd}{2}T\\p{Nd}{2}:\\p{Nd}{2}:\\p{Nd}{2}.\\p{Nd}{%d}%s\"/>\n"
-                                                                        "  </xsd:restriction>\n", typmod - VARHDRSZ, tz);
-                               break;
-                       }
+                               {
+                                       const char *tz = (typeoid == TIMESTAMPTZOID ? "(+|-)\\p{Nd}{2}:\\p{Nd}{2}" : "");
+
+                                       if (typmod == -1)
+                                               appendStringInfo(&result,
+                                                               "  <xsd:restriction base=\"xsd:dateTime\">\n"
+                                                                                "    <xsd:pattern value=\"\\p{Nd}{4}-\\p{Nd}{2}-\\p{Nd}{2}T\\p{Nd}{2}:\\p{Nd}{2}:\\p{Nd}{2}(.\\p{Nd}+)?%s\"/>\n"
+                                                                                "  </xsd:restriction>\n", tz);
+                                       else if (typmod == 0)
+                                               appendStringInfo(&result,
+                                                               "  <xsd:restriction base=\"xsd:dateTime\">\n"
+                                                                                "    <xsd:pattern value=\"\\p{Nd}{4}-\\p{Nd}{2}-\\p{Nd}{2}T\\p{Nd}{2}:\\p{Nd}{2}:\\p{Nd}{2}%s\"/>\n"
+                                                                                "  </xsd:restriction>\n", tz);
+                                       else
+                                               appendStringInfo(&result,
+                                                               "  <xsd:restriction base=\"xsd:dateTime\">\n"
+                                                                                "    <xsd:pattern value=\"\\p{Nd}{4}-\\p{Nd}{2}-\\p{Nd}{2}T\\p{Nd}{2}:\\p{Nd}{2}:\\p{Nd}{2}.\\p{Nd}{%d}%s\"/>\n"
+                                                       "  </xsd:restriction>\n", typmod - VARHDRSZ, tz);
+                                       break;
+                               }
 
                        case DATEOID:
                                appendStringInfo(&result,
@@ -3088,14 +3052,14 @@ map_sql_type_to_xmlschema_type(Oid typeoid, int typmod)
                        default:
                                if (get_typtype(typeoid) == TYPTYPE_DOMAIN)
                                {
-                                       Oid base_typeoid;
-                                       int32 base_typmod = -1;
+                                       Oid                     base_typeoid;
+                                       int32           base_typmod = -1;
 
                                        base_typeoid = getBaseTypeAndTypmod(typeoid, &base_typmod);
 
                                        appendStringInfo(&result,
-                                                                        "  <xsd:restriction base=\"%s\">\n",
-                                                                        map_sql_type_to_xml_name(base_typeoid, base_typmod));
+                                                                        "  <xsd:restriction base=\"%s\"/>\n",
+                                               map_sql_type_to_xml_name(base_typeoid, base_typmod));
                                }
                                break;
                }
@@ -3109,7 +3073,7 @@ map_sql_type_to_xmlschema_type(Oid typeoid, int typmod)
 
 /*
  * Map an SQL row to an XML element, taking the row from the active
- * SPI cursor.  See also SQL/XML:2003 section 9.12.
+ * SPI cursor. See also SQL/XML:2003 section 9.12.
  */
 static void
 SPI_sql_row_to_xmlelement(int rownum, StringInfo result, char *tablename,
@@ -3134,11 +3098,11 @@ SPI_sql_row_to_xmlelement(int rownum, StringInfo result, char *tablename,
        else
                appendStringInfoString(result, "<row>\n");
 
-       for(i = 1; i <= SPI_tuptable->tupdesc->natts; i++)
+       for (i = 1; i <= SPI_tuptable->tupdesc->natts; i++)
        {
-               char *colname;
-               Datum colval;
-               bool isnull;
+               char       *colname;
+               Datum           colval;
+               bool            isnull;
 
                colname = map_sql_identifier_to_xml_name(SPI_fname(SPI_tuptable->tupdesc, i),
                                                                                                 true, false);
@@ -3149,13 +3113,13 @@ SPI_sql_row_to_xmlelement(int rownum, StringInfo result, char *tablename,
                if (isnull)
                {
                        if (nulls)
-                               appendStringInfo(result, "  <%s xsi:nil='true'/>\n", colname);
+                               appendStringInfo(result, "  <%s xsi:nil=\"true\"/>\n", colname);
                }
                else
                        appendStringInfo(result, "  <%s>%s</%s>\n",
                                                         colname,
                                                         map_sql_value_to_xml_value(colval,
-                                                                                                               SPI_gettypeid(SPI_tuptable->tupdesc, i)),
+                                                                       SPI_gettypeid(SPI_tuptable->tupdesc, i)),
                                                         colname);
        }
 
@@ -3174,18 +3138,17 @@ SPI_sql_row_to_xmlelement(int rownum, StringInfo result, char *tablename,
  */
 
 #ifdef USE_LIBXML
-/* 
+/*
  * Convert XML node to text (dump subtree in case of element,
  * return value otherwise)
  */
 static text *
 xml_xmlnodetoxmltype(xmlNodePtr cur)
 {
-       xmlChar                         *str;
-       xmltype                         *result;
-       size_t                          len;
-       xmlBufferPtr            buf;
-       
+       xmlChar    *str;
+       xmltype    *result;
+       xmlBufferPtr buf;
+
        if (cur->type == XML_ELEMENT_NODE)
        {
                buf = xmlBufferCreate();
@@ -3196,12 +3159,10 @@ xml_xmlnodetoxmltype(xmlNodePtr cur)
        else
        {
                str = xmlXPathCastNodeToString(cur);
-               len = strlen((char *) str);
-               result = (text *) palloc(len + VARHDRSZ);
-               SET_VARSIZE(result, len + VARHDRSZ);
-               memcpy(VARDATA(result), str, len);
+               result = (xmltype *) cstring_to_text((char *) str);
+               xmlFree(str);
        }
-       
+
        return result;
 }
 #endif
@@ -3222,19 +3183,19 @@ xpath(PG_FUNCTION_ARGS)
 {
 #ifdef USE_LIBXML
        text       *xpath_expr_text = PG_GETARG_TEXT_P(0);
-       xmltype    *data = PG_GETARG_XML_P(1);
+       xmltype    *data = PG_GETARG_XML_P(1);
        ArrayType  *namespaces = PG_GETARG_ARRAYTYPE_P(2);
-       ArrayBuildState    *astate = NULL;
-       xmlParserCtxtPtr        ctxt = NULL;
-       xmlDocPtr                       doc = NULL;
-       xmlXPathContextPtr      xpathctx = NULL;
-       xmlXPathCompExprPtr     xpathcomp = NULL;
-       xmlXPathObjectPtr       xpathobj = NULL;
+       ArrayBuildState *astate = NULL;
+       xmlParserCtxtPtr ctxt;
+       xmlDocPtr       doc;
+       xmlXPathContextPtr xpathctx;
+       xmlXPathCompExprPtr xpathcomp;
+       xmlXPathObjectPtr xpathobj;
        char       *datastr;
        int32           len;
        int32           xpath_len;
-       xmlChar    *string;
-       xmlChar    *xpath_expr;
+       xmlChar    *string;
+       xmlChar    *xpath_expr;
        int                     i;
        int                     res_nitems;
        int                     ndim;
@@ -3243,13 +3204,13 @@ xpath(PG_FUNCTION_ARGS)
        int                     ns_count;
 
        /*
-        * Namespace mappings are passed as text[].  If an empty array is
-        * passed (ndim = 0, "0-dimensional"), then there are no namespace
-        * mappings.  Else, a 2-dimensional array with length of the
-        * second axis being equal to 2 should be passed, i.e., every
-        * subarray contains 2 elements, the first element defining the
-        * name, the second one the URI.  Example: ARRAY[ARRAY['myns',
-        * 'http://example.com'], ARRAY['myns2', 'http://example2.com']].
+        * Namespace mappings are passed as text[].  If an empty array is passed
+        * (ndim = 0, "0-dimensional"), then there are no namespace mappings.
+        * Else, a 2-dimensional array with length of the second axis being equal
+        * to 2 should be passed, i.e., every subarray contains 2 elements, the
+        * first element defining the name, the second one the URI.  Example:
+        * ARRAY[ARRAY['myns', 'http://example.com'], ARRAY['myns2',
+        * 'http://example2.com']].
         */
        ndim = ARR_NDIM(namespaces);
        if (ndim != 0)
@@ -3270,7 +3231,7 @@ xpath(PG_FUNCTION_ARGS)
                                                  &ns_names_uris, &ns_names_uris_nulls,
                                                  &ns_count);
 
-               Assert((ns_count % 2) == 0); /* checked above */
+               Assert((ns_count % 2) == 0);    /* checked above */
                ns_count /= 2;                  /* count pairs only */
        }
        else
@@ -3288,12 +3249,13 @@ xpath(PG_FUNCTION_ARGS)
                                (errcode(ERRCODE_DATA_EXCEPTION),
                                 errmsg("empty XPath expression")));
 
+       xml_init();
+
        /*
-        * To handle both documents and fragments, regardless of the fact
-        * whether the XML datum has a single root (XML well-formedness),
-        * we wrap the XML datum in a dummy element (<x>...</x>) and
-        * extend the XPath expression accordingly.  To do it, throw away
-        * the XML prolog, if any.
+        * To handle both documents and fragments, regardless of the fact whether
+        * the XML datum has a single root (XML well-formedness), we wrap the XML
+        * datum in a dummy element (<x>...</x>) and extend the XPath expression
+        * accordingly.  To do it, throw away the XML prolog, if any.
         */
        if (len >= 5 &&
                xmlStrncmp((xmlChar *) datastr, (xmlChar *) "<?xml", 5) == 0)
@@ -3308,127 +3270,106 @@ xpath(PG_FUNCTION_ARGS)
                                                "could not parse XML data");
 
                ++i;
-               string = xmlStrncatNew((xmlChar *) "<x>",
-                                                          (xmlChar *) datastr + i, len - i);
+
+               datastr += i;
+               len -= i;
        }
-       else
-               string = xmlStrncatNew((xmlChar *) "<x>",
-                                                          (xmlChar *) datastr, len);
 
-       string = xmlStrncat(string, (xmlChar *) "</x>", 5);
+       string = (xmlChar *) palloc((len + 8) * sizeof(xmlChar));
+       memcpy(string, "<x>", 3);
+       memcpy(string + 3, datastr, len);
+       memcpy(string + 3 + len, "</x>", 5);
        len += 7;
-       xpath_expr = xmlStrncatNew((xmlChar *) "/x",
-                                                          (xmlChar *) VARDATA(xpath_expr_text), xpath_len);
-       xpath_len += 2;
 
-       xml_init();
+       xpath_expr = (xmlChar *) palloc((xpath_len + 3) * sizeof(xmlChar));
+       memcpy(xpath_expr, "/x", 2);
+       memcpy(xpath_expr + 2, VARDATA(xpath_expr_text), xpath_len);
+       xpath_expr[xpath_len + 2] = '\0';
+       xpath_len += 2;
 
-       /* We use a PG_TRY block to ensure libxml parser is cleaned up on error */
-       PG_TRY();
-       {
-               xmlInitParser();
-               /*
-                * redundant XML parsing (two parsings for the same value
-                * during one command execution are possible)
-                */
-               ctxt = xmlNewParserCtxt();
-               if (ctxt == NULL)
-                       xml_ereport(ERROR, ERRCODE_INTERNAL_ERROR,
-                                               "could not allocate parser context");
-               doc = xmlCtxtReadMemory(ctxt, (char *) string, len, NULL, NULL, 0);
-               if (doc == NULL)
-                       xml_ereport(ERROR, ERRCODE_INVALID_XML_DOCUMENT,
-                                               "could not parse XML data");
-               xpathctx = xmlXPathNewContext(doc);
-               if (xpathctx == NULL)
-                       xml_ereport(ERROR, ERRCODE_INTERNAL_ERROR,
-                                               "could not allocate XPath context");
-               xpathctx->node = xmlDocGetRootElement(doc);
-               if (xpathctx->node == NULL)
-                       xml_ereport(ERROR, ERRCODE_INTERNAL_ERROR,
-                                               "could not find root XML element");
+       xmlInitParser();
 
-               /* register namespaces, if any */
-               if (ns_count > 0)
+       /*
+        * redundant XML parsing (two parsings for the same value during one
+        * command execution are possible)
+        */
+       ctxt = xmlNewParserCtxt();
+       if (ctxt == NULL)
+               xml_ereport(ERROR, ERRCODE_OUT_OF_MEMORY,
+                                       "could not allocate parser context");
+       doc = xmlCtxtReadMemory(ctxt, (char *) string, len, NULL, NULL, 0);
+       if (doc == NULL)
+               xml_ereport(ERROR, ERRCODE_INVALID_XML_DOCUMENT,
+                                       "could not parse XML data");
+       xpathctx = xmlXPathNewContext(doc);
+       if (xpathctx == NULL)
+               xml_ereport(ERROR, ERRCODE_OUT_OF_MEMORY,
+                                       "could not allocate XPath context");
+       xpathctx->node = xmlDocGetRootElement(doc);
+       if (xpathctx->node == NULL)
+               xml_ereport(ERROR, ERRCODE_INTERNAL_ERROR,
+                                       "could not find root XML element");
+
+       /* register namespaces, if any */
+       if (ns_count > 0)
+       {
+               for (i = 0; i < ns_count; i++)
                {
-                       for (i = 0; i < ns_count; i++)
-                       {
-                               char *ns_name;
-                               char *ns_uri;
-
-                               if (ns_names_uris_nulls[i * 2] ||
-                                       ns_names_uris_nulls[i * 2 + 1])
-                                       ereport(ERROR,
-                                                       (errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
-                                                        errmsg("neither namespace name nor URI may be null")));
-                               ns_name = _textout(ns_names_uris[i * 2]);
-                               ns_uri = _textout(ns_names_uris[i * 2 + 1]);
-                               if (xmlXPathRegisterNs(xpathctx,
-                                                                          (xmlChar *) ns_name,
-                                                                          (xmlChar *) ns_uri) != 0)
-                                       ereport(ERROR, /* is this an internal error??? */
-                                                       (errmsg("could not register XML namespace with name \"%s\" and URI \"%s\"",
-                                                                       ns_name, ns_uri)));
-                       }
+                       char       *ns_name;
+                       char       *ns_uri;
+
+                       if (ns_names_uris_nulls[i * 2] ||
+                               ns_names_uris_nulls[i * 2 + 1])
+                               ereport(ERROR,
+                                               (errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
+                                                errmsg("neither namespace name nor URI may be null")));
+                       ns_name = TextDatumGetCString(ns_names_uris[i * 2]);
+                       ns_uri = TextDatumGetCString(ns_names_uris[i * 2 + 1]);
+                       if (xmlXPathRegisterNs(xpathctx,
+                                                                  (xmlChar *) ns_name,
+                                                                  (xmlChar *) ns_uri) != 0)
+                               ereport(ERROR,          /* is this an internal error??? */
+                                               (errmsg("could not register XML namespace with name \"%s\" and URI \"%s\"",
+                                                               ns_name, ns_uri)));
                }
+       }
 
-               xpathcomp = xmlXPathCompile(xpath_expr);
-               if (xpathcomp == NULL)  /* TODO: show proper XPath error details */
-                       xml_ereport(ERROR, ERRCODE_INTERNAL_ERROR,
-                                               "invalid XPath expression");
+       xpathcomp = xmlXPathCompile(xpath_expr);
+       if (xpathcomp == NULL)  /* TODO: show proper XPath error details */
+               xml_ereport(ERROR, ERRCODE_INTERNAL_ERROR,
+                                       "invalid XPath expression");
 
-               xpathobj = xmlXPathCompiledEval(xpathcomp, xpathctx);
-               if (xpathobj == NULL)   /* TODO: reason? */
-                       ereport(ERROR,
-                                       (errmsg("could not create XPath object")));
+       xpathobj = xmlXPathCompiledEval(xpathcomp, xpathctx);
+       if (xpathobj == NULL)   /* TODO: reason? */
+               ereport(ERROR,
+                               (errmsg("could not create XPath object")));
 
-               xmlXPathFreeCompExpr(xpathcomp);
-               xpathcomp = NULL;
+       xmlXPathFreeCompExpr(xpathcomp);
 
-               /* return empty array in cases when nothing is found */
-               if (xpathobj->nodesetval == NULL)
-                       res_nitems = 0;
-               else
-                       res_nitems = xpathobj->nodesetval->nodeNr;
-
-               if (res_nitems)
-                       for (i = 0; i < xpathobj->nodesetval->nodeNr; i++)
-                       {
-                               Datum           elem;
-                               bool            elemisnull = false;
-                               elem = PointerGetDatum(xml_xmlnodetoxmltype(xpathobj->nodesetval->nodeTab[i]));
-                               astate = accumArrayResult(astate, elem,
-                                                                                 elemisnull, XMLOID,
-                                                                                 CurrentMemoryContext);
-                       }
+       /* return empty array in cases when nothing is found */
+       if (xpathobj->nodesetval == NULL)
+               res_nitems = 0;
+       else
+               res_nitems = xpathobj->nodesetval->nodeNr;
 
-               xmlXPathFreeObject(xpathobj);
-               xpathobj = NULL;
-               xmlXPathFreeContext(xpathctx);
-               xpathctx = NULL;
-               xmlFreeDoc(doc);
-               doc = NULL;
-               xmlFreeParserCtxt(ctxt);
-               ctxt = NULL;
-               xmlCleanupParser();
-       }
-       PG_CATCH();
+       if (res_nitems)
        {
-               if (xpathcomp)
-                       xmlXPathFreeCompExpr(xpathcomp);
-               if (xpathobj)
-                       xmlXPathFreeObject(xpathobj);
-               if (xpathctx)
-                       xmlXPathFreeContext(xpathctx);
-               if (doc)
-                       xmlFreeDoc(doc);
-               if (ctxt)
-                       xmlFreeParserCtxt(ctxt);
-               xmlCleanupParser();
+               for (i = 0; i < xpathobj->nodesetval->nodeNr; i++)
+               {
+                       Datum           elem;
+                       bool            elemisnull = false;
 
-               PG_RE_THROW();
+                       elem = PointerGetDatum(xml_xmlnodetoxmltype(xpathobj->nodesetval->nodeTab[i]));
+                       astate = accumArrayResult(astate, elem,
+                                                                         elemisnull, XMLOID,
+                                                                         CurrentMemoryContext);
+               }
        }
-       PG_END_TRY();
+
+       xmlXPathFreeObject(xpathobj);
+       xmlXPathFreeContext(xpathctx);
+       xmlFreeDoc(doc);
+       xmlFreeParserCtxt(ctxt);
 
        if (res_nitems == 0)
                PG_RETURN_ARRAYTYPE_P(construct_empty_array(XMLOID));