Fix broken pg_dump code for dumping comments on event triggers.

tglsfdc · tglsfdc · commit adfc157dd914 · 2015-01-05T19:27:04.000-05:00
This never worked, I think.  Per report from Marc Munro.

In passing, fix funny spacing in the COMMENT ON command as a result of
excess space in the "label" string.
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
@@ -15097,7 +15097,7 @@ dumpEventTrigger(Archive *fout, DumpOptions *dopt, EventTriggerInfo *evtinfo)
 		}
 		appendPQExpBufferStr(query, ";\n");
 	}
-	appendPQExpBuffer(labelq, "EVENT TRIGGER %s ",
+	appendPQExpBuffer(labelq, "EVENT TRIGGER %s",
 					  fmtId(evtinfo->dobj.name));
 
 	ArchiveEntry(fout, evtinfo->dobj.catId, evtinfo->dobj.dumpId,
@@ -15106,7 +15106,7 @@ dumpEventTrigger(Archive *fout, DumpOptions *dopt, EventTriggerInfo *evtinfo)
 				 query->data, "", NULL, NULL, 0, NULL, NULL);
 
 	dumpComment(fout, dopt, labelq->data,
-				NULL, NULL,
+				NULL, evtinfo->evtowner,
 				evtinfo->dobj.catId, 0, evtinfo->dobj.dumpId);
 
 	destroyPQExpBuffer(query);

Original file line number	Diff line number	Diff line change
`@@ -15097,7 +15097,7 @@ dumpEventTrigger(Archive fout, DumpOptions dopt, EventTriggerInfo *evtinfo)`
`15097`	`15097`	`}`
`15098`	`15098`	`appendPQExpBufferStr(query, ";\n");`
`15099`	`15099`	`}`
`15100`		`- appendPQExpBuffer(labelq, "EVENT TRIGGER %s ",`
	`15100`	`+ appendPQExpBuffer(labelq, "EVENT TRIGGER %s",`
`15101`	`15101`	`fmtId(evtinfo->dobj.name));`
`15102`	`15102`
`15103`	`15103`	`ArchiveEntry(fout, evtinfo->dobj.catId, evtinfo->dobj.dumpId,`
`@@ -15106,7 +15106,7 @@ dumpEventTrigger(Archive fout, DumpOptions dopt, EventTriggerInfo *evtinfo)`
`15106`	`15106`	`query->data, "", NULL, NULL, 0, NULL, NULL);`
`15107`	`15107`
`15108`	`15108`	`dumpComment(fout, dopt, labelq->data,`
`15109`		`- NULL, NULL,`
	`15109`	`+ NULL, evtinfo->evtowner,`
`15110`	`15110`	`evtinfo->dobj.catId, 0, evtinfo->dobj.dumpId);`
`15111`	`15111`
`15112`	`15112`	`destroyPQExpBuffer(query);`