diff options
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/parser/gram.y | 48 | ||||
| -rw-r--r-- | src/backend/utils/adt/xml.c | 86 |
2 files changed, 110 insertions, 24 deletions
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index 07ee2a8349..d9aebb0d72 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.714 2010/07/25 23:21:21 rhaas Exp $ + * $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.715 2010/08/05 04:21:53 petere Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT @@ -425,6 +425,7 @@ static TypeName *TableFuncTypeName(List *columns); %type <target> xml_attribute_el %type <list> xml_attribute_list xml_attributes %type <node> xml_root_version opt_xml_root_standalone +%type <node> xmlexists_argument %type <ival> document_or_content %type <boolean> xml_whitespace_option @@ -511,13 +512,13 @@ static TypeName *TableFuncTypeName(List *columns); OBJECT_P OF OFF OFFSET OIDS ON ONLY OPERATOR OPTION OPTIONS OR ORDER OUT_P OUTER_P OVER OVERLAPS OVERLAY OWNED OWNER - PARSER PARTIAL PARTITION PASSWORD PLACING PLANS POSITION + PARSER PARTIAL PARTITION PASSING PASSWORD PLACING PLANS POSITION PRECEDING PRECISION PRESERVE PREPARE PREPARED PRIMARY PRIOR PRIVILEGES PROCEDURAL PROCEDURE QUOTE - RANGE READ REAL REASSIGN RECHECK RECURSIVE REFERENCES REINDEX + RANGE READ REAL REASSIGN RECHECK RECURSIVE REF REFERENCES REINDEX RELATIVE_P RELEASE RENAME REPEATABLE REPLACE REPLICA RESET RESTART RESTRICT RETURNING RETURNS REVOKE RIGHT ROLE ROLLBACK ROW ROWS RULE @@ -539,7 +540,7 @@ static TypeName *TableFuncTypeName(List *columns); WHEN WHERE WHITESPACE_P WINDOW WITH WITHOUT WORK WRAPPER WRITE - XML_P XMLATTRIBUTES XMLCONCAT XMLELEMENT XMLFOREST XMLPARSE + XML_P XMLATTRIBUTES XMLCONCAT XMLELEMENT XMLEXISTS XMLFOREST XMLPARSE XMLPI XMLROOT XMLSERIALIZE YEAR_P YES_P @@ -9839,6 +9840,21 @@ func_expr: func_name '(' ')' over_clause { $$ = makeXmlExpr(IS_XMLELEMENT, $4, $6, $8, @1); } + | XMLEXISTS '(' c_expr xmlexists_argument ')' + { + /* xmlexists(A PASSING [BY REF] B [BY REF]) is + * converted to xmlexists(A, B)*/ + FuncCall *n = makeNode(FuncCall); + n->funcname = SystemFuncName("xmlexists"); + n->args = list_make2($3, $4); + n->agg_order = NIL; + n->agg_star = FALSE; + n->agg_distinct = FALSE; + n->func_variadic = FALSE; + n->over = NULL; + n->location = @1; + $$ = (Node *)n; + } | XMLFOREST '(' xml_attribute_list ')' { $$ = makeXmlExpr(IS_XMLFOREST, NULL, $3, NIL, @1); @@ -9929,6 +9945,27 @@ xml_whitespace_option: PRESERVE WHITESPACE_P { $$ = TRUE; } | /*EMPTY*/ { $$ = FALSE; } ; +/* We allow several variants for SQL and other compatibility. */ +xmlexists_argument: + PASSING c_expr + { + $$ = $2; + } + | PASSING c_expr BY REF + { + $$ = $2; + } + | PASSING BY REF c_expr + { + $$ = $4; + } + | PASSING BY REF c_expr BY REF + { + $$ = $4; + } + ; + + /* * Window Definitions */ @@ -10999,6 +11036,7 @@ unreserved_keyword: | PARSER | PARTIAL | PARTITION + | PASSING | PASSWORD | PLANS | PRECEDING @@ -11015,6 +11053,7 @@ unreserved_keyword: | REASSIGN | RECHECK | RECURSIVE + | REF | REINDEX | RELATIVE_P | RELEASE @@ -11148,6 +11187,7 @@ col_name_keyword: | XMLATTRIBUTES | XMLCONCAT | XMLELEMENT + | XMLEXISTS | XMLFOREST | XMLPARSE | XMLPI diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c index eaf5b4d550..6587f4e4fc 100644 --- a/src/backend/utils/adt/xml.c +++ b/src/backend/utils/adt/xml.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/utils/adt/xml.c,v 1.98 2010/07/06 19:18:58 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/xml.c,v 1.99 2010/08/05 04:21:54 petere Exp $ * *------------------------------------------------------------------------- */ @@ -3295,24 +3295,20 @@ xml_xmlnodetoxmltype(xmlNodePtr cur) /* - * Evaluate XPath expression and return array of XML values. + * Common code for xpath() and xmlexists() * - * As we have no support of XQuery sequences yet, this function seems - * to be the most useful one (array of XML functions plays a role of - * some kind of substitution for XQuery sequences). + * Evaluate XPath expression and return number of nodes in res_items + * and array of XML values in astate. * * It is up to the user to ensure that the XML passed is in fact * an XML document - XPath doesn't work easily on fragments without * a context node being known. */ -Datum -xpath(PG_FUNCTION_ARGS) -{ #ifdef USE_LIBXML - text *xpath_expr_text = PG_GETARG_TEXT_P(0); - xmltype *data = PG_GETARG_XML_P(1); - ArrayType *namespaces = PG_GETARG_ARRAYTYPE_P(2); - ArrayBuildState *astate = NULL; +static void +xpath_internal(text *xpath_expr_text, xmltype *data, ArrayType *namespaces, + int *res_nitems, ArrayBuildState **astate) +{ xmlParserCtxtPtr ctxt = NULL; xmlDocPtr doc = NULL; xmlXPathContextPtr xpathctx = NULL; @@ -3324,7 +3320,6 @@ xpath(PG_FUNCTION_ARGS) xmlChar *string; xmlChar *xpath_expr; int i; - int res_nitems; int ndim; Datum *ns_names_uris; bool *ns_names_uris_nulls; @@ -3339,7 +3334,7 @@ xpath(PG_FUNCTION_ARGS) * ARRAY[ARRAY['myns', 'http://example.com'], ARRAY['myns2', * 'http://example2.com']]. */ - ndim = ARR_NDIM(namespaces); + ndim = namespaces ? ARR_NDIM(namespaces) : 0; if (ndim != 0) { int *dims; @@ -3439,6 +3434,13 @@ xpath(PG_FUNCTION_ARGS) xml_ereport(ERROR, ERRCODE_INTERNAL_ERROR, "invalid XPath expression"); + /* + * Version 2.6.27 introduces a function named + * xmlXPathCompiledEvalToBoolean, which would be enough for + * xmlexists, but we can derive the existence by whether any + * nodes are returned, thereby preventing a library version + * upgrade and keeping the code the same. + */ xpathobj = xmlXPathCompiledEval(xpathcomp, xpathctx); if (xpathobj == NULL) /* TODO: reason? */ xml_ereport(ERROR, ERRCODE_INTERNAL_ERROR, @@ -3446,21 +3448,22 @@ xpath(PG_FUNCTION_ARGS) /* return empty array in cases when nothing is found */ if (xpathobj->nodesetval == NULL) - res_nitems = 0; + *res_nitems = 0; else - res_nitems = xpathobj->nodesetval->nodeNr; + *res_nitems = xpathobj->nodesetval->nodeNr; - if (res_nitems) + if (*res_nitems && astate) { + *astate = NULL; 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); + *astate = accumArrayResult(*astate, elem, + elemisnull, XMLOID, + CurrentMemoryContext); } } } @@ -3485,6 +3488,28 @@ xpath(PG_FUNCTION_ARGS) xmlXPathFreeContext(xpathctx); xmlFreeDoc(doc); xmlFreeParserCtxt(ctxt); +} +#endif /* USE_LIBXML */ + +/* + * Evaluate XPath expression and return array of XML values. + * + * As we have no support of XQuery sequences yet, this function seems + * to be the most useful one (array of XML functions plays a role of + * some kind of substitution for XQuery sequences). + */ +Datum +xpath(PG_FUNCTION_ARGS) +{ +#ifdef USE_LIBXML + text *xpath_expr_text = PG_GETARG_TEXT_P(0); + xmltype *data = PG_GETARG_XML_P(1); + ArrayType *namespaces = PG_GETARG_ARRAYTYPE_P(2); + int res_nitems; + ArrayBuildState *astate; + + xpath_internal(xpath_expr_text, data, namespaces, + &res_nitems, &astate); if (res_nitems == 0) PG_RETURN_ARRAYTYPE_P(construct_empty_array(XMLOID)); @@ -3495,3 +3520,24 @@ xpath(PG_FUNCTION_ARGS) return 0; #endif } + +/* + * Determines if the node specified by the supplied XPath exists + * in a given XML document, returning a boolean. + */ +Datum xmlexists(PG_FUNCTION_ARGS) +{ +#ifdef USE_LIBXML + text *xpath_expr_text = PG_GETARG_TEXT_P(0); + xmltype *data = PG_GETARG_XML_P(1); + int res_nitems; + + xpath_internal(xpath_expr_text, data, NULL, + &res_nitems, NULL); + + PG_RETURN_BOOL(res_nitems > 0); +#else + NO_XML_SUPPORT(); + return 0; +#endif +} |