Commit3245bd5

committed

Simplify pg_upgrade queries by using IN instead of multiple OR clauses

comparing the same column to multiple values.

1 parent573e446 commit3245bd5Copy full SHA for 3245bd5

File tree

-6

lines changed

-6

lines changed

Lines changed: 4 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -327,19 +327,17 @@ get_rel_infos(migratorContext ctx, const DbInfo dbinfo,`
`327`	`327`	`"AND c.oid >= %u "`
`328`	`328`	`") OR ( "`
`329`	`329`	`"n.nspname = 'pg_catalog' "`
`330`		`-"AND (relname = 'pg_largeobject' OR "`
`331`		`-" relname = 'pg_largeobject_loid_pn_index') )) "`
`332`		`-"AND "`
`333`		`-"(relkind = 'r' OR relkind = 't' OR "`
`334`		`-" relkind = 'i'%s)"`
	`330`	`+"AND relname IN "`
	`331`	`+" ('pg_largeobject', 'pg_largeobject_loid_pn_index') )) "`
	`332`	`+"AND relkind IN ('r','t', 'i'%s)"`
`335`	`333`	`"GROUP BY c.oid, n.nspname, c.relname, c.relfilenode,"`
`336`	`334`	`"c.reltoastrelid, t.spclocation, "`
`337`	`335`	`"n.nspname "`
`338`	`336`	`"ORDER BY n.nspname, c.relname;",`
`339`	`337`	`FirstNormalObjectId,`
`340`	`338`	`/* see the comment at the top of old_8_3_create_sequence_script() */`
`341`	`339`	`(GET_MAJOR_VERSION(ctx->old.major_version) <=803) ?`
`342`		`-"" :" OR relkind = 'S'");`
	`340`	`+"" :", 'S'");`
`343`	`341`
`344`	`342`	`res=executeQueryOrDie(ctx,conn,query);`
`345`	`343`

Comments

(0)