Fix XMLTABLE on older libxml2

alvherre · alvherre · commit a9f66f92533b · 2017-03-08T13:29:48.000-03:00
libxml2 older than 2.9.1 does not have xmlXPathSetContextNode (released
in 2013, so reasonable platforms have trouble).  That function is fairly
trivial, so I have inlined it in the one added caller.  This passes
tests on my machine; let's see what the buildfarm thinks about it.

Per joint complaint from Tom Lane and buildfarm.
diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c
@@ -4431,7 +4431,7 @@ XmlTableGetValue(TableFuncScanState *state, int colnum,
 	PG_TRY();
 	{
 		/* Set current node as entry point for XPath evaluation */
-		xmlXPathSetContextNode(cur, xtCxt->xpathcxt);
+		xtCxt->xpathcxt->node = cur;
 
 		/* Evaluate column path */
 		xpathobj = xmlXPathCompiledEval(xtCxt->xpathscomp[colnum], xtCxt->xpathcxt);

Original file line number	Diff line number	Diff line change
`@@ -4431,7 +4431,7 @@ XmlTableGetValue(TableFuncScanState *state, int colnum,`
`4431`	`4431`	`PG_TRY();`
`4432`	`4432`	`{`
`4433`	`4433`	`/* Set current node as entry point for XPath evaluation */`
`4434`		`- xmlXPathSetContextNode(cur, xtCxt->xpathcxt);`
	`4434`	`+ xtCxt->xpathcxt->node = cur;`
`4435`	`4435`
`4436`	`4436`	`/* Evaluate column path */`
`4437`	`4437`	`xpathobj = xmlXPathCompiledEval(xtCxt->xpathscomp[colnum], xtCxt->xpathcxt);`