Commit157239d

committed

pg_dump: Fix dumping of slot_name = NONE

It previously wrote out slot_name = '', which was incorrect.Reported-by: Masahiko Sawada <sawada.mshk@gmail.com>

1 parent6234569 commit157239dCopy full SHA for 157239d

File tree

-2

lines changed

-2

lines changed

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3763,7 +3763,10 @@ getSubscriptions(Archive *fout)`
`3763`	`3763`	`subinfo[i].dobj.name = pg_strdup(PQgetvalue(res, i, i_subname));`
`3764`	`3764`	`subinfo[i].rolname = pg_strdup(PQgetvalue(res, i, i_rolname));`
`3765`	`3765`	`subinfo[i].subconninfo = pg_strdup(PQgetvalue(res, i, i_subconninfo));`
`3766`		`-subinfo[i].subslotname = pg_strdup(PQgetvalue(res, i, i_subslotname));`
	`3766`	`+if (PQgetisnull(res, i, i_subslotname))`
	`3767`	`+subinfo[i].subslotname = NULL;`
	`3768`	`+else`
	`3769`	`+subinfo[i].subslotname = pg_strdup(PQgetvalue(res, i, i_subslotname));`
`3767`	`3770`	`subinfo[i].subsynccommit =`
`3768`	`3771`	`pg_strdup(PQgetvalue(res, i, i_subsynccommit));`
`3769`	`3772`	`subinfo[i].subpublications =`
`@@ -3831,7 +3834,10 @@ dumpSubscription(Archive fout, SubscriptionInfo subinfo)`
`3831`	`3834`	`}`
`3832`	`3835`
`3833`	`3836`	`appendPQExpBuffer(query, " PUBLICATION %s WITH (connect = false, slot_name = ", publications->data);`
`3834`		`-appendStringLiteralAH(query, subinfo->subslotname, fout);`
	`3837`	`+if (subinfo->subslotname)`
	`3838`	`+appendStringLiteralAH(query, subinfo->subslotname, fout);`
	`3839`	`+else`
	`3840`	`+appendPQExpBufferStr(query, "NONE");`
`3835`	`3841`
`3836`	`3842`	`if (strcmp(subinfo->subsynccommit, "off") != 0)`
`3837`	`3843`	`appendPQExpBuffer(query, ", synchronous_commit = %s", fmtId(subinfo->subsynccommit));`

Comments

(0)