Fix pg_dump/pg_restore to restore event trigger comments later.

Repair an oversight in commit 8728b2c70: if we're postponing restore
of event triggers to the end, we must also postpone restoring any
comments on them, since of course we cannot create the comments first.
(This opens yet another opportunity for an event trigger to bollix
the restore, but there's no help for that.)

Per bug #16346 from Alexander Lakhin.

Like the previous commit, back-patch to all supported branches.

Hamid Akhtar and Tom Lane

Discussion: https://postgr.es/m/16346-6210ad7a0ea81be1@postgresql.org

diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
index 0611a56f8bf49f15ee10c50c1f39e4ff9c24f5f9..48a1ac1a26155b39e175a9a097f96b172a1b3d34 100644 (file)
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -2971,6 +2971,18 @@ _tocEntryRestorePass(TocEntry *te)
        if (strcmp(te->desc, "EVENT TRIGGER") == 0 ||
                strcmp(te->desc, "MATERIALIZED VIEW DATA") == 0)
                return RESTORE_PASS_POST_ACL;
+
+       /*
+        * Comments need to be emitted in the same pass as their parent objects.
+        * ACLs haven't got comments, and neither do matview data objects, but
+        * event triggers do.  (Fortunately, event triggers haven't got ACLs, or
+        * we'd need yet another weird special case.)
+        */
+       if (strcmp(te->desc, "COMMENT") == 0 &&
+               strncmp(te->tag, "EVENT TRIGGER ", 14) == 0)
+               return RESTORE_PASS_POST_ACL;
+
+       /* All else can be handled in the main pass. */
        return RESTORE_PASS_MAIN;
 }