Fix broken pg_dump code for dumping comments on event triggers.

tglsfdc · tglsfdc · commit c99e41f686ba · 2015-01-05T19:27:06.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
@@ -14769,7 +14769,7 @@ dumpEventTrigger(Archive *fout, 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,
@@ -14778,7 +14778,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
`@@ -14769,7 +14769,7 @@ dumpEventTrigger(Archive fout, EventTriggerInfo evtinfo)`
`14769`	`14769`	`}`
`14770`	`14770`	`appendPQExpBufferStr(query, ";\n");`
`14771`	`14771`	`}`
`14772`		`- appendPQExpBuffer(labelq, "EVENT TRIGGER %s ",`
	`14772`	`+ appendPQExpBuffer(labelq, "EVENT TRIGGER %s",`
`14773`	`14773`	`fmtId(evtinfo->dobj.name));`
`14774`	`14774`
`14775`	`14775`	`ArchiveEntry(fout, evtinfo->dobj.catId, evtinfo->dobj.dumpId,`
`@@ -14778,7 +14778,7 @@ dumpEventTrigger(Archive fout, EventTriggerInfo evtinfo)`
`14778`	`14778`	`query->data, "", NULL, NULL, 0, NULL, NULL);`
`14779`	`14779`
`14780`	`14780`	`dumpComment(fout, labelq->data,`
`14781`		`- NULL, NULL,`
	`14781`	`+ NULL, evtinfo->evtowner,`
`14782`	`14782`	`evtinfo->dobj.catId, 0, evtinfo->dobj.dumpId);`
`14783`	`14783`
`14784`	`14784`	`destroyPQExpBuffer(query);`