database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-24 10:47:04 +03:00
Code

Add extra descriptive headings in pg_dumpall

Browse Source 
Headings are added for the User Configurations and Databases sections,
and for each user configuration and database in the output.

Author: Fabien Coelho
Discussion: https://postgr.es/m/alpine.DEB.2.21.1812272222130.32444@lancre
This commit is contained in:
Andrew Dunstan 2019-03-01 11:38:54 -05:00
parent f092de0503
commit 6cbdbd9e8d
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/bin/pg_dump/pg_dumpall.c
View File

@ -1346,6 +1346,7 @@ dumpUserConfig(PGconn *conn, const char *username)
{ {
PQExpBuffer buf = createPQExpBuffer(); PQExpBuffer buf = createPQExpBuffer();
int count = 1; int count = 1;
bool first = true;
for (;;) for (;;)
{ {
@ -1367,6 +1368,14 @@ dumpUserConfig(PGconn *conn, const char *username)
if (PQntuples(res) == 1 && if (PQntuples(res) == 1 &&
!PQgetisnull(res, 0, 0)) !PQgetisnull(res, 0, 0))
{ {
/* comment at section start, only if needed */
if (first)
{
fprintf(OPF, "--\n-- User Configurations\n--\n\n");
first = false;
}
fprintf(OPF, "--\n-- User Config \"%s\"\n--\n\n", username);
resetPQExpBuffer(buf); resetPQExpBuffer(buf);
makeAlterConfigCommand(conn, PQgetvalue(res, 0, 0), makeAlterConfigCommand(conn, PQgetvalue(res, 0, 0),
"ROLE", username, NULL, NULL, "ROLE", username, NULL, NULL,
@ -1454,6 +1463,9 @@ dumpDatabases(PGconn *conn)
"WHERE datallowconn " "WHERE datallowconn "
"ORDER BY (datname <> 'template1'), datname"); "ORDER BY (datname <> 'template1'), datname");
if (PQntuples(res) > 0)
fprintf(OPF, "--\n-- Databases\n--\n\n");
for (i = 0; i < PQntuples(res); i++) for (i = 0; i < PQntuples(res); i++)
{ {
char *dbname = PQgetvalue(res, i, 0); char *dbname = PQgetvalue(res, i, 0);
@ -1476,6 +1488,8 @@ dumpDatabases(PGconn *conn)
if (verbose) if (verbose)
fprintf(stderr, _("%s: dumping database \"%s\"...\n"), progname, dbname); fprintf(stderr, _("%s: dumping database \"%s\"...\n"), progname, dbname);
fprintf(OPF, "--\n-- Database \"%s\" dump\n--\n\n", dbname);
/* /*
* We assume that "template1" and "postgres" already exist in the * We assume that "template1" and "postgres" already exist in the
* target installation. dropDBs() won't have removed them, for fear * target installation. dropDBs() won't have removed them, for fear