Teach pg_dump to dump comments on RLS policy objects.

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[email protected]

diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 33e58fa287e7c4a2c10dfe177be49218844c157d..8b861fa9042955727f040223dec657b46c583c94 100644 (file)
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -3661,6 +3661,8 @@ dumpPolicy(Archive *fout, PolicyInfo *polinfo)
    TableInfo  *tbinfo = polinfo->poltable;
    PQExpBuffer query;
    PQExpBuffer delqry;
+   PQExpBuffer polprefix;
+   char       *qtabname;
    const char *cmd;
    char       *tag;
 
@@ -3718,6 +3720,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));
 
@@ -3738,6 +3743,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));
+
    tag = psprintf("%s %s", tbinfo->dobj.name, polinfo->dobj.name);
 
    if (polinfo->dobj.dump & DUMP_COMPONENT_POLICY)
@@ -3750,9 +3758,16 @@ dumpPolicy(Archive *fout, PolicyInfo *polinfo)
                                  .createStmt = query->data,
                                  .dropStmt = delqry->data));
 
+   if (polinfo->dobj.dump & DUMP_COMPONENT_COMMENT)
+       dumpComment(fout, polprefix->data, qtabname,
+                   tbinfo->dobj.namespace->dobj.name, tbinfo->rolname,
+                   polinfo->dobj.catId, 0, polinfo->dobj.dumpId);
+
    free(tag);
    destroyPQExpBuffer(query);
    destroyPQExpBuffer(delqry);
+   destroyPQExpBuffer(polprefix);
+   free(qtabname);
 }
 
 /*