mirror of
https://github.com/postgres/postgres.git
synced 2025-06-29 10:41:53 +03:00
Rethink pg_dump's handling of object ACLs.
Throw away most of the existing logic for this, as it was very inefficient thanks to expensive sub-selects executed to collect ACL data that we very possibly would have no interest in dumping. Reduce the ACL handling in the initial per-object-type queries to be just collection of the catalog ACL fields, as it was originally. Fetch pg_init_privs data separately in a single scan of that catalog, and do the merging calculations on the client side. Remove the separate code path used for pre-9.6 source servers; there is no good reason to treat them differently from newer servers that happen to have empty pg_init_privs. Discussion: https://postgr.es/m/2273648.1634764485@sss.pgh.pa.us Discussion: https://postgr.es/m/7d7eb6128f40401d81b3b7a898b6b4de@W2012-02.nidsa.loc
This commit is contained in:
@ -726,6 +726,69 @@ parsePGArray(const char *atext, char ***itemarray, int *nitems)
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Append one element to the text representation of a 1-dimensional Postgres
|
||||
* array.
|
||||
*
|
||||
* The caller must provide the initial '{' and closing '}' of the array.
|
||||
* This function handles all else, including insertion of commas and
|
||||
* quoting of values.
|
||||
*
|
||||
* We assume that typdelim is ','.
|
||||
*/
|
||||
void
|
||||
appendPGArray(PQExpBuffer buffer, const char *value)
|
||||
{
|
||||
bool needquote;
|
||||
const char *tmp;
|
||||
|
||||
if (buffer->data[buffer->len - 1] != '{')
|
||||
appendPQExpBufferChar(buffer, ',');
|
||||
|
||||
/* Decide if we need quotes; this should match array_out()'s choices. */
|
||||
if (value[0] == '\0')
|
||||
needquote = true; /* force quotes for empty string */
|
||||
else if (pg_strcasecmp(value, "NULL") == 0)
|
||||
needquote = true; /* force quotes for literal NULL */
|
||||
else
|
||||
needquote = false;
|
||||
|
||||
if (!needquote)
|
||||
{
|
||||
for (tmp = value; *tmp; tmp++)
|
||||
{
|
||||
char ch = *tmp;
|
||||
|
||||
if (ch == '"' || ch == '\\' ||
|
||||
ch == '{' || ch == '}' || ch == ',' ||
|
||||
/* these match array_isspace(): */
|
||||
ch == ' ' || ch == '\t' || ch == '\n' ||
|
||||
ch == '\r' || ch == '\v' || ch == '\f')
|
||||
{
|
||||
needquote = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (needquote)
|
||||
{
|
||||
appendPQExpBufferChar(buffer, '"');
|
||||
for (tmp = value; *tmp; tmp++)
|
||||
{
|
||||
char ch = *tmp;
|
||||
|
||||
if (ch == '"' || ch == '\\')
|
||||
appendPQExpBufferChar(buffer, '\\');
|
||||
appendPQExpBufferChar(buffer, ch);
|
||||
}
|
||||
appendPQExpBufferChar(buffer, '"');
|
||||
}
|
||||
else
|
||||
appendPQExpBufferStr(buffer, value);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Format a reloptions array and append it to the given buffer.
|
||||
*
|
||||
|
Reference in New Issue
Block a user