Commit9783413

committed

Tighten pg_upgrade's new check for non-upgradable anyarray usages.

We only need to reject cases when the aggregate or operator isitself declared with a polymorphic type. Per buildfarm.Discussion:https://postgr.es/m/3383880.QJadu78ljV@vejsadalnx

1 parent175e60a commit9783413Copy full SHA for 9783413

File tree

-1

lines changed

-1

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1040,6 +1040,7 @@ check_for_incompatible_polymorphics(ClusterInfo *cluster)`
`1040`	`1040`	`"JOIN pg_proc AS transfn ON transfn.oid=a.aggtransfn "`
`1041`	`1041`	`"WHERE p.oid >= 16384 "`
`1042`	`1042`	`"AND a.aggtransfn = ANY(ARRAY[%s]::regprocedure[]) "`
	`1043`	`+"AND a.aggtranstype = ANY(ARRAY['anyarray', 'anyelement']::regtype[]) "`
`1043`	`1044`
`1044`	`1045`	`/* Aggregate final functions */`
`1045`	`1046`	`"UNION ALL "`
`@@ -1049,13 +1050,15 @@ check_for_incompatible_polymorphics(ClusterInfo *cluster)`
`1049`	`1050`	`"JOIN pg_proc AS finalfn ON finalfn.oid=a.aggfinalfn "`
`1050`	`1051`	`"WHERE p.oid >= 16384 "`
`1051`	`1052`	`"AND a.aggfinalfn = ANY(ARRAY[%s]::regprocedure[]) "`
	`1053`	`+"AND a.aggtranstype = ANY(ARRAY['anyarray', 'anyelement']::regtype[]) "`
`1052`	`1054`
`1053`	`1055`	`/* Operators */`
`1054`	`1056`	`"UNION ALL "`
`1055`	`1057`	`"SELECT 'operator' AS objkind, op.oid::regoperator::text AS objname "`
`1056`	`1058`	`"FROM pg_operator AS op "`
`1057`	`1059`	`"WHERE op.oid >= 16384 "`
`1058`		`-"AND oprcode = ANY(ARRAY[%s]::regprocedure[]);",`
	`1060`	`+"AND oprcode = ANY(ARRAY[%s]::regprocedure[]) "`
	`1061`	`+"AND oprleft = ANY(ARRAY['anyarray', 'anyelement']::regtype[]);",`
`1059`	`1062`	`old_polymorphics.data,`
`1060`	`1063`	`old_polymorphics.data,`
`1061`	`1064`	`old_polymorphics.data);`

Comments

(0)