Fix broken pg_dump code for dumping comments on event triggers.

tglsfdc · tglsfdc · commit bb1e2426bf90 · 2015-01-05T19:27:09.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
@@ -14432,7 +14432,7 @@ dumpEventTrigger(Archive *fout, EventTriggerInfo *evtinfo)
 		}
 		appendPQExpBuffer(query, ";\n");
 	}
-	appendPQExpBuffer(labelq, "EVENT TRIGGER %s ",
+	appendPQExpBuffer(labelq, "EVENT TRIGGER %s",
 					  fmtId(evtinfo->dobj.name));
 
 	ArchiveEntry(fout, evtinfo->dobj.catId, evtinfo->dobj.dumpId,
@@ -14441,7 +14441,7 @@ dumpEventTrigger(Archive *fout, EventTriggerInfo *evtinfo)
 				 query->data, "", NULL, NULL, 0, NULL, NULL);
 
 	dumpComment(fout, 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
`@@ -14432,7 +14432,7 @@ dumpEventTrigger(Archive fout, EventTriggerInfo evtinfo)`
`14432`	`14432`	`}`
`14433`	`14433`	`appendPQExpBuffer(query, ";\n");`
`14434`	`14434`	`}`
`14435`		`- appendPQExpBuffer(labelq, "EVENT TRIGGER %s ",`
	`14435`	`+ appendPQExpBuffer(labelq, "EVENT TRIGGER %s",`
`14436`	`14436`	`fmtId(evtinfo->dobj.name));`
`14437`	`14437`
`14438`	`14438`	`ArchiveEntry(fout, evtinfo->dobj.catId, evtinfo->dobj.dumpId,`
`@@ -14441,7 +14441,7 @@ dumpEventTrigger(Archive fout, EventTriggerInfo evtinfo)`
`14441`	`14441`	`query->data, "", NULL, NULL, 0, NULL, NULL);`
`14442`	`14442`
`14443`	`14443`	`dumpComment(fout, labelq->data,`
`14444`		`- NULL, NULL,`
	`14444`	`+ NULL, evtinfo->evtowner,`
`14445`	`14445`	`evtinfo->dobj.catId, 0, evtinfo->dobj.dumpId);`
`14446`	`14446`
`14447`	`14447`	`destroyPQExpBuffer(query);`