aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2018-08-27 15:11:12 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2018-08-27 15:11:12 -0400
commit3998e55af0505458e99b11bb0b77bb528e647696 (patch)
treeda35d6a245fd701390d55e358db4fa35a38645af
parent8895daf1bdb206f374b50a723dd9a8e944b74c25 (diff)
downloadpostgresql-3998e55af0505458e99b11bb0b77bb528e647696.tar.gz
postgresql-3998e55af0505458e99b11bb0b77bb528e647696.zip
Fix missing dependency for pg_dump's ENABLE ROW LEVEL SECURITY items.
The archive should show a dependency on the item's table, but it failed to include one. This could cause failures in parallel restore due to emitting ALTER TABLE ... ENABLE ROW LEVEL SECURITY before restoring the table's data. In practice the odds of a problem seem low, since you would typically need to have set FORCE ROW LEVEL SECURITY as well, and you'd also need a very high --jobs count to have any chance of this happening. That probably explains the lack of field reports. Still, it's a bug, so back-patch to 9.5 where RLS was introduced. Discussion: https://postgr.es/m/19784.1535390902@sss.pgh.pa.us
-rw-r--r--src/bin/pg_dump/pg_dump.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index d7928e999a2..77a6988d829 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -3049,8 +3049,8 @@ getPolicies(Archive *fout, TableInfo tblinfo[], int numTables)
/*
* Get row security enabled information for the table. We represent
- * RLS enabled on a table by creating PolicyInfo object with an empty
- * policy.
+ * RLS being enabled on a table by creating a PolicyInfo object with
+ * null polname.
*/
if (tbinfo->rowsec)
{
@@ -3172,8 +3172,13 @@ dumpPolicy(Archive *fout, PolicyInfo *polinfo)
query = createPQExpBuffer();
appendPQExpBuffer(query, "ALTER TABLE %s ENABLE ROW LEVEL SECURITY;",
- fmtQualifiedDumpable(polinfo));
+ fmtQualifiedDumpable(tbinfo));
+ /*
+ * We must emit the ROW SECURITY object's dependency on its table
+ * explicitly, because it will not match anything in pg_depend (unlike
+ * the case for other PolicyInfo objects).
+ */
ArchiveEntry(fout, polinfo->dobj.catId, polinfo->dobj.dumpId,
polinfo->dobj.name,
polinfo->dobj.namespace->dobj.name,
@@ -3181,7 +3186,7 @@ dumpPolicy(Archive *fout, PolicyInfo *polinfo)
tbinfo->rolname, false,
"ROW SECURITY", SECTION_POST_DATA,
query->data, "", NULL,
- NULL, 0,
+ &(tbinfo->dobj.dumpId), 1,
NULL, NULL);
destroyPQExpBuffer(query);