Commitb0cadc0

committed

Fix regrole and regnamespace output functions to do quoting, too.

We discussed this but somehow failed to implement it...

1 parentfb1227a commitb0cadc0Copy full SHA for b0cadc0

File tree

+14

-2

lines changed

+14

-2

lines changed

Lines changed: 14 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1642,12 +1642,18 @@ regroleout(PG_FUNCTION_ARGS)`
`1642`	`1642`
`1643`	`1643`	`result=GetUserNameFromId(roleoid, true);`
`1644`	`1644`
`1645`		`-if (!result)`
	`1645`	`+if (result)`
	`1646`	`+{`
	`1647`	`+/* pstrdup is not really necessary, but it avoids a compiler warning */`
	`1648`	`+result=pstrdup(quote_identifier(result));`
	`1649`	`+}`
	`1650`	`+else`
`1646`	`1651`	`{`
`1647`	`1652`	`/* If OID doesn't match any role, return it numerically */`
`1648`	`1653`	`result= (char*)palloc(NAMEDATALEN);`
`1649`	`1654`	`snprintf(result,NAMEDATALEN,"%u",roleoid);`
`1650`	`1655`	`}`
	`1656`	`+`
`1651`	`1657`	`PG_RETURN_CSTRING(result);`
`1652`	`1658`	`}`
`1653`	`1659`
`@@ -1757,12 +1763,18 @@ regnamespaceout(PG_FUNCTION_ARGS)`
`1757`	`1763`
`1758`	`1764`	`result=get_namespace_name(nspid);`
`1759`	`1765`
`1760`		`-if (!result)`
	`1766`	`+if (result)`
	`1767`	`+{`
	`1768`	`+/* pstrdup is not really necessary, but it avoids a compiler warning */`
	`1769`	`+result=pstrdup(quote_identifier(result));`
	`1770`	`+}`
	`1771`	`+else`
`1761`	`1772`	`{`
`1762`	`1773`	`/* If OID doesn't match any namespace, return it numerically */`
`1763`	`1774`	`result= (char*)palloc(NAMEDATALEN);`
`1764`	`1775`	`snprintf(result,NAMEDATALEN,"%u",nspid);`
`1765`	`1776`	`}`
	`1777`	`+`
`1766`	`1778`	`PG_RETURN_CSTRING(result);`
`1767`	`1779`	`}`
`1768`	`1780`

Comments

(0)