Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Teach pg_dump to dump comments on RLS policy objects.
authorTom Lane <tgl@sss.pgh.pa.us>
Mon, 17 Feb 2020 23:40:02 +0000 (18:40 -0500)
committerTom Lane <tgl@sss.pgh.pa.us>
Mon, 17 Feb 2020 23:40:02 +0000 (18:40 -0500)
This was unaccountably omitted in the original RLS patch.
The SQL syntax is basically the same as for comments on triggers,
so crib code from dumpTrigger().

Per report from Marc Munro.  Back-patch to all supported branches.

Discussion: https://postgr.es/m/1581889298.18009.15.camel@bloodnok.com

src/bin/pg_dump/pg_dump.c

index c9fcb0231dd164191a2ebb1febfce4e4e70b0da0..e7a12794b608da68941994c34d175de40fee2fae 100644 (file)
@@ -3157,6 +3157,8 @@ dumpPolicy(Archive *fout, PolicyInfo *polinfo)
    TableInfo  *tbinfo = polinfo->poltable;
    PQExpBuffer query;
    PQExpBuffer delqry;
+   PQExpBuffer polprefix;
+   char       *qtabname;
    const char *cmd;
 
    if (dopt->dataOnly)
@@ -3212,6 +3214,9 @@ dumpPolicy(Archive *fout, PolicyInfo *polinfo)
 
    query = createPQExpBuffer();
    delqry = createPQExpBuffer();
+   polprefix = createPQExpBuffer();
+
+   qtabname = pg_strdup(fmtId(tbinfo->dobj.name));
 
    appendPQExpBuffer(query, "CREATE POLICY %s", fmtId(polinfo->polname));
 
@@ -3232,6 +3237,9 @@ dumpPolicy(Archive *fout, PolicyInfo *polinfo)
    appendPQExpBuffer(delqry, "DROP POLICY %s", fmtId(polinfo->polname));
    appendPQExpBuffer(delqry, " ON %s;\n", fmtQualifiedDumpable(tbinfo));
 
+   appendPQExpBuffer(polprefix, "POLICY %s ON",
+                     fmtId(polinfo->polname));
+
    ArchiveEntry(fout, polinfo->dobj.catId, polinfo->dobj.dumpId,
                 polinfo->dobj.name,
                 polinfo->dobj.namespace->dobj.name,
@@ -3242,8 +3250,14 @@ dumpPolicy(Archive *fout, PolicyInfo *polinfo)
                 NULL, 0,
                 NULL, NULL);
 
+   dumpComment(fout, polprefix->data, qtabname,
+               tbinfo->dobj.namespace->dobj.name, tbinfo->rolname,
+               polinfo->dobj.catId, 0, polinfo->dobj.dumpId);
+
    destroyPQExpBuffer(query);
    destroyPQExpBuffer(delqry);
+   destroyPQExpBuffer(polprefix);
+   free(qtabname);
 }
 
 static void