NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit4806f26

committed

Fix pg_dump to work against pre-9.0 servers again.

getBlobs' queries for pre-9.0 servers were broken in two ways:the 7.x/8.x query uses DISTINCT so it can't have unspecified-typeNULLs in the target list, and both that query and the 7.0 onefailed to provide the correct output column labels, so that thesubsequent code to extract data from the PGresult would fail.Back-patch to 9.6 where the breakage was introduced (by commit23f34fa).Amit Langote and Tom LaneDiscussion: <0a3e7a0e-37bd-8427-29bd-958135862f0a@lab.ntt.co.jp>

1 parent0d4d7d6 commit4806f26Copy full SHA for 4806f26

File tree

1 file changed

-8

lines changed

src/bin/pg_dump
- pg_dump.c

1 file changed

-8

lines changed

`‎src/bin/pg_dump/pg_dump.c`

Lines changed: 9 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -2875,19 +2875,20 @@ getBlobs(Archive *fout)`
`2875`	`2875`	`else if (fout->remoteVersion >= 90000)`
`2876`	`2876`	`appendPQExpBuffer(blobQry,`
`2877`	`2877`	`"SELECT oid, (%s lomowner) AS rolname, lomacl, "`
`2878`		`- "NULL AS rlomacl, NULLas initlomacl, "`
`2879`		`- "NULLas initrlomacl "`
	`2878`	`+ "NULL AS rlomacl, NULLAS initlomacl, "`
	`2879`	`+ "NULLAS initrlomacl "`
`2880`	`2880`	`" FROM pg_largeobject_metadata",`
`2881`	`2881`	`username_subquery);`
`2882`	`2882`	`else if (fout->remoteVersion >= 70100)`
`2883`	`2883`	`appendPQExpBufferStr(blobQry,`
`2884`		`- "SELECT DISTINCT loid, NULL::oid, NULL, "`
`2885`		`- "NULL AS rlomacl, NULL AS initlomacl, "`
`2886`		`- "NULL AS initrlomacl "`
	`2884`	`+ "SELECT DISTINCT loid AS oid, "`
	`2885`	`+ "NULL::name AS rolname, NULL::oid AS lomacl, "`
	`2886`	`+ "NULL::oid AS rlomacl, NULL::oid AS initlomacl, "`
	`2887`	`+ "NULL::oid AS initrlomacl "`
`2887`	`2888`	`" FROM pg_largeobject");`
`2888`	`2889`	`else`
`2889`	`2890`	`appendPQExpBufferStr(blobQry,`
`2890`		`- "SELECT oid, NULL::oid, NULL, "`
	`2891`	`+ "SELECT oid, NULL AS rolname, NULL AS lomacl, "`
`2891`	`2892`	`"NULL AS rlomacl, NULL AS initlomacl, "`
`2892`	`2893`	`"NULL AS initrlomacl "`
`2893`	`2894`	`" FROM pg_class WHERE relkind = 'l'");`
`@@ -2922,11 +2923,11 @@ getBlobs(Archive *fout)`
`2922`	`2923`	`binfo[i].initblobacl = pg_strdup(PQgetvalue(res, i, i_initlomacl));`
`2923`	`2924`	`binfo[i].initrblobacl = pg_strdup(PQgetvalue(res, i, i_initrlomacl));`
`2924`	`2925`
`2925`		`-if (PQgetisnull(res, i, i_lomacl) && PQgetisnull(res, i, i_rlomacl) &&`
	`2926`	`+if (PQgetisnull(res, i, i_lomacl) &&`
	`2927`	`+PQgetisnull(res, i, i_rlomacl) &&`
`2926`	`2928`	`PQgetisnull(res, i, i_initlomacl) &&`
`2927`	`2929`	`PQgetisnull(res, i, i_initrlomacl))`
`2928`	`2930`	`binfo[i].dobj.dump &= ~DUMP_COMPONENT_ACL;`
`2929`		`-`
`2930`	`2931`	`}`
`2931`	`2932`
`2932`	`2933`	`/*`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit4806f26

File tree

1 file changed

1 file changed

`‎src/bin/pg_dump/pg_dump.c`

0 commit comments