Fix pg_dump's handling of event triggers.

tglsfdc · tglsfdc · commit 68a22bc69df8 · 2017-07-22T20:20:10.000-04:00
pg_dump with the --clean option failed to emit DROP EVENT TRIGGER commands for event triggers. In a closely related oversight, it also did not emit ALTER OWNER commands for event triggers. Since only superusers can create event triggers, the latter oversight is of little practical consequence ... but if we're going to record an owner for event triggers, then surely pg_dump should preserve it. Per complaint from Greg Atkins. Back-patch to 9.3 where event triggers were introduced. Discussion: https://postgr.es/m/20170722191142.yi4e7tzcg3iacclg@gmail.com
diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
@@ -2994,6 +2994,7 @@ _getObjectDescription(PQExpBuffer buf, TocEntry *te, ArchiveHandle *AH)
 	if (strcmp(type, "DATABASE") == 0 ||
 		strcmp(type, "PROCEDURAL LANGUAGE") == 0 ||
 		strcmp(type, "SCHEMA") == 0 ||
+		strcmp(type, "EVENT TRIGGER") == 0 ||
 		strcmp(type, "FOREIGN DATA WRAPPER") == 0 ||
 		strcmp(type, "SERVER") == 0 ||
 		strcmp(type, "USER MAPPING") == 0)
@@ -3037,7 +3038,7 @@ _getObjectDescription(PQExpBuffer buf, TocEntry *te, ArchiveHandle *AH)
 		return;
 	}
 
-	write_msg(modulename, "WARNING: don't know how to set owner for object type %s\n",
+	write_msg(modulename, "WARNING: don't know how to set owner for object type \"%s\"\n",
 			  type);
 }
 
@@ -3194,6 +3195,7 @@ _printTocEntry(ArchiveHandle *AH, TocEntry *te, RestoreOptions *ropt, bool isDat
 			strcmp(te->desc, "OPERATOR FAMILY") == 0 ||
 			strcmp(te->desc, "PROCEDURAL LANGUAGE") == 0 ||
 			strcmp(te->desc, "SCHEMA") == 0 ||
+			strcmp(te->desc, "EVENT TRIGGER") == 0 ||
 			strcmp(te->desc, "TABLE") == 0 ||
 			strcmp(te->desc, "TYPE") == 0 ||
 			strcmp(te->desc, "VIEW") == 0 ||
@@ -3227,7 +3229,7 @@ _printTocEntry(ArchiveHandle *AH, TocEntry *te, RestoreOptions *ropt, bool isDat
 		}
 		else
 		{
-			write_msg(modulename, "WARNING: don't know how to set owner for object type %s\n",
+			write_msg(modulename, "WARNING: don't know how to set owner for object type \"%s\"\n",
 					  te->desc);
 		}
 	}
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
@@ -14496,13 +14496,15 @@ static void
 dumpEventTrigger(Archive *fout, EventTriggerInfo *evtinfo)
 {
 	PQExpBuffer query;
+	PQExpBuffer delqry;
 	PQExpBuffer labelq;
 
 	/* Skip if not to be dumped */
 	if (!evtinfo->dobj.dump || dataOnly)
 		return;
 
 	query = createPQExpBuffer();
+	delqry = createPQExpBuffer();
 	labelq = createPQExpBuffer();
 
 	appendPQExpBuffer(query, "CREATE EVENT TRIGGER ");
@@ -14542,19 +14544,27 @@ dumpEventTrigger(Archive *fout, EventTriggerInfo *evtinfo)
 		}
 		appendPQExpBuffer(query, ";\n");
 	}
+
+	appendPQExpBuffer(delqry, "DROP EVENT TRIGGER %s;\n",
+					  fmtId(evtinfo->dobj.name));
+
 	appendPQExpBuffer(labelq, "EVENT TRIGGER %s",
 					  fmtId(evtinfo->dobj.name));
 
 	ArchiveEntry(fout, evtinfo->dobj.catId, evtinfo->dobj.dumpId,
-				 evtinfo->dobj.name, NULL, NULL, evtinfo->evtowner, false,
+				 evtinfo->dobj.name, NULL, NULL,
+				 evtinfo->evtowner, false,
 				 "EVENT TRIGGER", SECTION_POST_DATA,
-				 query->data, "", NULL, NULL, 0, NULL, NULL);
+				 query->data, delqry->data, NULL,
+				 NULL, 0,
+				 NULL, NULL);
 
 	dumpComment(fout, labelq->data,
 				NULL, evtinfo->evtowner,
 				evtinfo->dobj.catId, 0, evtinfo->dobj.dumpId);
 
 	destroyPQExpBuffer(query);
+	destroyPQExpBuffer(delqry);
 	destroyPQExpBuffer(labelq);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2994,6 +2994,7 @@ _getObjectDescription(PQExpBuffer buf, TocEntry te, ArchiveHandle AH)`
`2994`	`2994`	`if (strcmp(type, "DATABASE") == 0 \|\|`
`2995`	`2995`	`strcmp(type, "PROCEDURAL LANGUAGE") == 0 \|\|`
`2996`	`2996`	`strcmp(type, "SCHEMA") == 0 \|\|`
	`2997`	`+ strcmp(type, "EVENT TRIGGER") == 0 \|\|`
`2997`	`2998`	`strcmp(type, "FOREIGN DATA WRAPPER") == 0 \|\|`
`2998`	`2999`	`strcmp(type, "SERVER") == 0 \|\|`
`2999`	`3000`	`strcmp(type, "USER MAPPING") == 0)`
`@@ -3037,7 +3038,7 @@ _getObjectDescription(PQExpBuffer buf, TocEntry te, ArchiveHandle AH)`
`3037`	`3038`	`return;`
`3038`	`3039`	`}`
`3039`	`3040`
`3040`		`- write_msg(modulename, "WARNING: don't know how to set owner for object type %s\n",`
	`3041`	`+ write_msg(modulename, "WARNING: don't know how to set owner for object type \"%s\"\n",`
`3041`	`3042`	`type);`
`3042`	`3043`	`}`
`3043`	`3044`
`@@ -3194,6 +3195,7 @@ _printTocEntry(ArchiveHandle AH, TocEntry te, RestoreOptions *ropt, bool isDat`
`3194`	`3195`	`strcmp(te->desc, "OPERATOR FAMILY") == 0 \|\|`
`3195`	`3196`	`strcmp(te->desc, "PROCEDURAL LANGUAGE") == 0 \|\|`
`3196`	`3197`	`strcmp(te->desc, "SCHEMA") == 0 \|\|`
	`3198`	`+ strcmp(te->desc, "EVENT TRIGGER") == 0 \|\|`
`3197`	`3199`	`strcmp(te->desc, "TABLE") == 0 \|\|`
`3198`	`3200`	`strcmp(te->desc, "TYPE") == 0 \|\|`
`3199`	`3201`	`strcmp(te->desc, "VIEW") == 0 \|\|`
`@@ -3227,7 +3229,7 @@ _printTocEntry(ArchiveHandle AH, TocEntry te, RestoreOptions *ropt, bool isDat`
`3227`	`3229`	`}`
`3228`	`3230`	`else`
`3229`	`3231`	`{`
`3230`		`- write_msg(modulename, "WARNING: don't know how to set owner for object type %s\n",`
	`3232`	`+ write_msg(modulename, "WARNING: don't know how to set owner for object type \"%s\"\n",`
`3231`	`3233`	`te->desc);`
`3232`	`3234`	`}`
`3233`	`3235`	`}`