database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-25 21:42:33 +03:00
Code

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

Browse Source 
We discussed this but somehow failed to implement it...
This commit is contained in:
Tom Lane 2016-01-04 01:53:24 -05:00
parent fb1227af67
commit b0cadc08fe
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/backend/utils/adt/regproc.c
View File

@ -1642,12 +1642,18 @@ regroleout(PG_FUNCTION_ARGS)
result = GetUserNameFromId(roleoid, true); result = GetUserNameFromId(roleoid, true);
if (!result) if (result)
{
/* pstrdup is not really necessary, but it avoids a compiler warning */
result = pstrdup(quote_identifier(result));
}
else
{ {
/* If OID doesn't match any role, return it numerically */ /* If OID doesn't match any role, return it numerically */
result = (char *) palloc(NAMEDATALEN); result = (char *) palloc(NAMEDATALEN);
snprintf(result, NAMEDATALEN, "%u", roleoid); snprintf(result, NAMEDATALEN, "%u", roleoid);
} }
PG_RETURN_CSTRING(result); PG_RETURN_CSTRING(result);
} }
@ -1757,12 +1763,18 @@ regnamespaceout(PG_FUNCTION_ARGS)
result = get_namespace_name(nspid); result = get_namespace_name(nspid);
if (!result) if (result)
{
/* pstrdup is not really necessary, but it avoids a compiler warning */
result = pstrdup(quote_identifier(result));
}
else
{ {
/* If OID doesn't match any namespace, return it numerically */ /* If OID doesn't match any namespace, return it numerically */
result = (char *) palloc(NAMEDATALEN); result = (char *) palloc(NAMEDATALEN);
snprintf(result, NAMEDATALEN, "%u", nspid); snprintf(result, NAMEDATALEN, "%u", nspid);
} }
PG_RETURN_CSTRING(result); PG_RETURN_CSTRING(result);
} }