Commiteb19144

committed

Add support for optionally escaping periods when converting SQL identifiers

to XML names, which will be required for supporting XML export.

1 parent733abd2 commiteb19144Copy full SHA for eb19144

File tree

+16

-8

lines changed

+16

-8

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/parser/parse_expr.c,v 1.210 2007/02/03 14:06:54 petere Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/parser/parse_expr.c,v 1.211 2007/02/11 22:18:15 petere Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -1389,7 +1389,7 @@ transformXmlExpr(ParseState pstate, XmlExpr x)`
`1389`	`1389`
`1390`	`1390`	`newx->op=x->op;`
`1391`	`1391`	`if (x->name)`
`1392`		`-newx->name=map_sql_identifier_to_xml_name(x->name, false);`
	`1392`	`+newx->name=map_sql_identifier_to_xml_name(x->name, false, false);`
`1393`	`1393`	`else`
`1394`	`1394`	`newx->name=NULL;`
`1395`	`1395`
`@@ -1411,10 +1411,10 @@ transformXmlExpr(ParseState pstate, XmlExpr x)`
`1411`	`1411`	`expr=transformExpr(pstate,r->val);`
`1412`	`1412`
`1413`	`1413`	`if (r->name)`
`1414`		`-argname=map_sql_identifier_to_xml_name(r->name, false);`
	`1414`	`+argname=map_sql_identifier_to_xml_name(r->name, false, false);`
`1415`	`1415`	`elseif (IsA(r->val,ColumnRef))`
`1416`	`1416`	`argname=map_sql_identifier_to_xml_name(FigureColname(r->val),`
`1417`		`- true);`
	`1417`	`+ true, false);`
`1418`	`1418`	`else`
`1419`	`1419`	`{`
`1420`	`1420`	`ereport(ERROR,`

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group`
`8`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`		`- * $PostgreSQL: pgsql/src/backend/utils/adt/xml.c,v 1.26 2007/02/1018:47:41 petere Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/backend/utils/adt/xml.c,v 1.27 2007/02/11 22:18:15 petere Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -1318,8 +1318,14 @@ is_valid_xml_namechar(pg_wchar c)`
`1318`	`1318`	`* Map SQL identifier to XML name; see SQL/XML:2003 section 9.1.`
`1319`	`1319`	`*/`
`1320`	`1320`	`char*`
`1321`		`-map_sql_identifier_to_xml_name(char*ident,boolfully_escaped)`
	`1321`	`+map_sql_identifier_to_xml_name(char*ident,boolfully_escaped,boolescape_period)`
`1322`	`1322`	`{`
	`1323`	`+/*`
	`1324`	`+ * SQL/XML doesn't make use of this case anywhere, so it's`
	`1325`	`+ * probably a mistake.`
	`1326`	`+ */`
	`1327`	`+Assert(fully_escaped\|\| !escape_period);`
	`1328`	`+`
`1323`	`1329`	`#ifdefUSE_LIBXML`
`1324`	`1330`	`StringInfoDatabuf;`
`1325`	`1331`	`char*p;`
`@@ -1340,6 +1346,8 @@ map_sql_identifier_to_xml_name(char *ident, bool fully_escaped)`
`1340`	`1346`	`else`
`1341`	`1347`	`appendStringInfo(&buf,"_x0058_");`
`1342`	`1348`	`}`
	`1349`	`+elseif (escape_period&&*p=='.')`
	`1350`	`+appendStringInfo(&buf,"_x002E_");`
`1343`	`1351`	`else`
`1344`	`1352`	`{`
`1345`	`1353`	`pg_wcharu=sqlchar_to_unicode(p);`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group`
`8`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`		`- * $PostgreSQL: pgsql/src/include/utils/xml.h,v 1.14 2007/02/03 14:06:56 petere Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/include/utils/xml.h,v 1.15 2007/02/11 22:18:16 petere Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -53,7 +53,7 @@ extern xmltype xmlroot(xmltype data, text *version, int standalone);`
`53`	`53`	`externboolxml_is_document(xmltype*arg);`
`54`	`54`	`externtextxmltotext_with_xmloption(xmltypedata,XmlOptionTypexmloption_arg);`
`55`	`55`
`56`		`-externcharmap_sql_identifier_to_xml_name(charident,boolfully_escaped);`
	`56`	`+externcharmap_sql_identifier_to_xml_name(charident,boolfully_escaped,boolescape_period);`
`57`	`57`	`externcharmap_xml_name_to_sql_identifier(charname);`
`58`	`58`	`externchar*map_sql_value_to_xml_value(Datumvalue,Oidtype);`
`59`	`59`

Comments

(0)