NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit0c9391e

committed

Fix core dump in pg_dump --binary-upgrade on zero-column composite type.

This reverts nearly all of commit28f6cabin favor of just using the typrelid we already have in pg_dump's TypeInfostruct for the composite type. As coded, it'd crash if the composite typehad no attributes, since then the query would return no rows.Back-patch to all supported versions. It seems to not really be a problemin 9.0 because that version rejects the syntax "create type t as ()", butwe might as well keep the logic similar in all affected branches.Report and fix by Rushabh Lathia.

1 parent2784b68 commit0c9391eCopy full SHA for 0c9391e

File tree

1 file changed

-9

lines changed

src/bin/pg_dump
- pg_dump.c

1 file changed

-9

lines changed

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

Lines changed: 3 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -8085,7 +8085,6 @@ dumpCompositeType(Archive fout, TypeInfo tyinfo)`
`8085`	`8085`	`inti_attalign;`
`8086`	`8086`	`inti_attisdropped;`
`8087`	`8087`	`inti_attcollation;`
`8088`		`-inti_typrelid;`
`8089`	`8088`	`inti;`
`8090`	`8089`	`intactual_atts;`
`8091`	`8090`
`@@ -8106,8 +8105,7 @@ dumpCompositeType(Archive fout, TypeInfo tyinfo)`
`8106`	`8105`	`"pg_catalog.format_type(a.atttypid, a.atttypmod) AS atttypdefn, "`
`8107`	`8106`	`"a.attlen, a.attalign, a.attisdropped, "`
`8108`	`8107`	`"CASE WHEN a.attcollation <> at.typcollation "`
`8109`		`-"THEN a.attcollation ELSE 0 END AS attcollation, "`
`8110`		`-"ct.typrelid "`
	`8108`	`+"THEN a.attcollation ELSE 0 END AS attcollation "`
`8111`	`8109`	`"FROM pg_catalog.pg_type ct "`
`8112`	`8110`	`"JOIN pg_catalog.pg_attribute a ON a.attrelid = ct.typrelid "`
`8113`	`8111`	`"LEFT JOIN pg_catalog.pg_type at ON at.oid = a.atttypid "`
`@@ -8125,8 +8123,7 @@ dumpCompositeType(Archive fout, TypeInfo tyinfo)`
`8125`	`8123`	`appendPQExpBuffer(query,"SELECT a.attname, "`
`8126`	`8124`	`"pg_catalog.format_type(a.atttypid, a.atttypmod) AS atttypdefn, "`
`8127`	`8125`	`"a.attlen, a.attalign, a.attisdropped, "`
`8128`		`-"0 AS attcollation, "`
`8129`		`-"ct.typrelid "`
	`8126`	`+"0 AS attcollation "`
`8130`	`8127`	`"FROM pg_catalog.pg_type ct, pg_catalog.pg_attribute a "`
`8131`	`8128`	`"WHERE ct.oid = '%u'::pg_catalog.oid "`
`8132`	`8129`	`"AND a.attrelid = ct.typrelid "`
`@@ -8145,14 +8142,11 @@ dumpCompositeType(Archive fout, TypeInfo tyinfo)`
`8145`	`8142`	`i_attalign=PQfnumber(res,"attalign");`
`8146`	`8143`	`i_attisdropped=PQfnumber(res,"attisdropped");`
`8147`	`8144`	`i_attcollation=PQfnumber(res,"attcollation");`
`8148`		`-i_typrelid=PQfnumber(res,"typrelid");`
`8149`	`8145`
`8150`	`8146`	`if (binary_upgrade)`
`8151`	`8147`	`{`
`8152`		`-Oidtyprelid=atooid(PQgetvalue(res,0,i_typrelid));`
`8153`		`-`
`8154`	`8148`	`binary_upgrade_set_type_oids_by_type_oid(q,tyinfo->dobj.catId.oid);`
`8155`		`-binary_upgrade_set_pg_class_oids(q,typrelid, false);`
	`8149`	`+binary_upgrade_set_pg_class_oids(q,tyinfo->typrelid, false);`
`8156`	`8150`	`}`
`8157`	`8151`
`8158`	`8152`	`appendPQExpBuffer(q,"CREATE TYPE %s AS (",`

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!

Commit0c9391e

File tree

1 file changed

1 file changed

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

0 commit comments