Fix bogus syntax for CREATE PUBLICATION commands emitted by pg_dump.

tglsfdc · tglsfdc · commit 4041808b5b70 · 2017-05-15T11:48:39.000-04:00
Original coding was careless about where to insert commas. Masahiko Sawada Discussion: https://postgr.es/m/3427593a-61aa-b17e-64ef-383b7742d6d9@enterprisedb.com
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
@@ -3491,20 +3491,20 @@ dumpPublication(Archive *fout, PublicationInfo *pubinfo)
 		first = false;
 	}
 
-	if (!first)
-		appendPQExpBufferStr(query, ", ");
-
 	if (pubinfo->pubupdate)
 	{
+		if (!first)
+			appendPQExpBufferStr(query, ", ");
+
 		appendPQExpBufferStr(query, "update");
 		first = false;
 	}
 
-	if (!first)
-		appendPQExpBufferStr(query, ", ");
-
 	if (pubinfo->pubdelete)
 	{
+		if (!first)
+			appendPQExpBufferStr(query, ", ");
+
 		appendPQExpBufferStr(query, "delete");
 		first = false;
 	}

Original file line number	Diff line number	Diff line change
`@@ -3491,20 +3491,20 @@ dumpPublication(Archive fout, PublicationInfo pubinfo)`
`3491`	`3491`	`first = false;`
`3492`	`3492`	`}`
`3493`	`3493`
`3494`		`- if (!first)`
`3495`		`- appendPQExpBufferStr(query, ", ");`
`3496`		`-`
`3497`	`3494`	`if (pubinfo->pubupdate)`
`3498`	`3495`	`{`
	`3496`	`+ if (!first)`
	`3497`	`+ appendPQExpBufferStr(query, ", ");`
	`3498`	`+`
`3499`	`3499`	`appendPQExpBufferStr(query, "update");`
`3500`	`3500`	`first = false;`
`3501`	`3501`	`}`
`3502`	`3502`
`3503`		`- if (!first)`
`3504`		`- appendPQExpBufferStr(query, ", ");`
`3505`		`-`
`3506`	`3503`	`if (pubinfo->pubdelete)`
`3507`	`3504`	`{`
	`3505`	`+ if (!first)`
	`3506`	`+ appendPQExpBufferStr(query, ", ");`
	`3507`	`+`
`3508`	`3508`	`appendPQExpBufferStr(query, "delete");`
`3509`	`3509`	`first = false;`
`3510`	`3510`	`}`