diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index 08c2b0c..0b2f503 100644 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@ -245,7 +245,7 @@ static void getBlobs(Archive *fout); static void dumpBlob(Archive *fout, BlobInfo *binfo); static int dumpBlobs(Archive *fout, void *arg); static void dumpPolicy(Archive *fout, PolicyInfo *polinfo); -static void dumpDatabase(Archive *AH); +static void dumpDatabase(Archive *AH, bool aclsSkip); static void dumpEncoding(Archive *AH); static void dumpStdStrings(Archive *AH); static void binary_upgrade_set_type_oids_by_type_oid(Archive *fout, @@ -803,7 +803,7 @@ main(int argc, char **argv) /* The database item is always next, unless we don't want it at all */ if (dopt.include_everything && !dopt.dataOnly) - dumpDatabase(fout); + dumpDatabase(fout, dopt.aclsSkip); /* Now the rearrangeable objects. */ for (i = 0; i < numObjs; i++) @@ -2393,7 +2393,7 @@ guessConstraintInheritance(TableInfo *tblinfo, int numTables) * dump the database definition */ static void -dumpDatabase(Archive *fout) +dumpDatabase(Archive *fout, bool aclsSkip) { DumpOptions *dopt = fout->dopt; PQExpBuffer dbQry = createPQExpBuffer(); @@ -2404,6 +2404,7 @@ dumpDatabase(Archive *fout) int i_tableoid, i_oid, i_dba, + i_dbacl, i_encoding, i_collate, i_ctype, @@ -2414,6 +2415,7 @@ dumpDatabase(Archive *fout) DumpId dbDumpId; const char *datname, *dba, + *dbacl, *encoding, *collate, *ctype, @@ -2435,7 +2437,7 @@ dumpDatabase(Archive *fout) appendPQExpBuffer(dbQry, "SELECT tableoid, oid, " "(%s datdba) AS dba, " "pg_encoding_to_char(encoding) AS encoding, " - "datcollate, datctype, datfrozenxid, datminmxid, " + "datcollate, datctype, datfrozenxid, datminmxid, datacl, " "(SELECT spcname FROM pg_tablespace t WHERE t.oid = dattablespace) AS tablespace, " "shobj_description(oid, 'pg_database') AS description " @@ -2449,7 +2451,7 @@ dumpDatabase(Archive *fout) appendPQExpBuffer(dbQry, "SELECT tableoid, oid, " "(%s datdba) AS dba, " "pg_encoding_to_char(encoding) AS encoding, " - "datcollate, datctype, datfrozenxid, 0 AS datminmxid, " + "datcollate, datctype, datfrozenxid, 0 AS datminmxid, datacl, " "(SELECT spcname FROM pg_tablespace t WHERE t.oid = dattablespace) AS tablespace, " "shobj_description(oid, 'pg_database') AS description " @@ -2463,7 +2465,7 @@ dumpDatabase(Archive *fout) appendPQExpBuffer(dbQry, "SELECT tableoid, oid, " "(%s datdba) AS dba, " "pg_encoding_to_char(encoding) AS encoding, " - "NULL AS datcollate, NULL AS datctype, datfrozenxid, 0 AS datminmxid, " + "NULL AS datcollate, NULL AS datctype, datfrozenxid, 0 AS datminmxid, datacl, " "(SELECT spcname FROM pg_tablespace t WHERE t.oid = dattablespace) AS tablespace, " "shobj_description(oid, 'pg_database') AS description " @@ -2477,7 +2479,7 @@ dumpDatabase(Archive *fout) appendPQExpBuffer(dbQry, "SELECT tableoid, oid, " "(%s datdba) AS dba, " "pg_encoding_to_char(encoding) AS encoding, " - "NULL AS datcollate, NULL AS datctype, datfrozenxid, 0 AS datminmxid, " + "NULL AS datcollate, NULL AS datctype, datfrozenxid, 0 AS datminmxid, datacl, " "(SELECT spcname FROM pg_tablespace t WHERE t.oid = dattablespace) AS tablespace " "FROM pg_database " "WHERE datname = ", @@ -2490,7 +2492,7 @@ dumpDatabase(Archive *fout) "(%s datdba) AS dba, " "pg_encoding_to_char(encoding) AS encoding, " "NULL AS datcollate, NULL AS datctype, " - "0 AS datfrozenxid, 0 AS datminmxid, " + "0 AS datfrozenxid, 0 AS datminmxid, NULL AS datacl, " "NULL AS tablespace " "FROM pg_database " "WHERE datname = ", @@ -2505,7 +2507,7 @@ dumpDatabase(Archive *fout) "(%s datdba) AS dba, " "pg_encoding_to_char(encoding) AS encoding, " "NULL AS datcollate, NULL AS datctype, " - "0 AS datfrozenxid, 0 AS datminmxid, " + "0 AS datfrozenxid, 0 AS datminmxid, NULL AS datacl, " "NULL AS tablespace " "FROM pg_database " "WHERE datname = ", @@ -2524,6 +2526,7 @@ dumpDatabase(Archive *fout) i_frozenxid = PQfnumber(res, "datfrozenxid"); i_minmxid = PQfnumber(res, "datminmxid"); i_tablespace = PQfnumber(res, "tablespace"); + i_dbacl = PQfnumber(res, "datacl"); dbCatId.tableoid = atooid(PQgetvalue(res, 0, i_tableoid)); dbCatId.oid = atooid(PQgetvalue(res, 0, i_oid)); @@ -2534,6 +2537,7 @@ dumpDatabase(Archive *fout) frozenxid = atooid(PQgetvalue(res, 0, i_frozenxid)); minmxid = atooid(PQgetvalue(res, 0, i_minmxid)); tablespace = PQgetvalue(res, 0, i_tablespace); + dbacl = PQgetvalue(res, 0, i_dbacl); appendPQExpBuffer(creaQry, "CREATE DATABASE %s WITH TEMPLATE = template0", fmtId(datname)); @@ -2569,6 +2573,15 @@ dumpDatabase(Archive *fout) } + /* Build ACL's on the database */ + if (!aclsSkip && + !buildACLCommands(datname, NULL, "DATABASE", dbacl, "", dba, + "", fout->remoteVersion, creaQry)) + { + exit_horribly(NULL, _("%s: could not parse ACL list (%s) for database \"%s\"\n"), + progname, dbacl, datname); + } + appendPQExpBuffer(delQry, "DROP DATABASE %s;\n", fmtId(datname));