Commitc7e21e9

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 parent4a37527 commitc7e21e9Copy full SHA for c7e21e9

File tree

-1

lines changed

-1

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1070,6 +1070,7 @@ check_for_incompatible_polymorphics(ClusterInfo *cluster)`
`1070`	`1070`	`"JOIN pg_proc AS transfn ON transfn.oid=a.aggtransfn "`
`1071`	`1071`	`"WHERE p.oid >= 16384 "`
`1072`	`1072`	`"AND a.aggtransfn = ANY(ARRAY[%s]::regprocedure[]) "`
	`1073`	`+"AND a.aggtranstype = ANY(ARRAY['anyarray', 'anyelement']::regtype[]) "`
`1073`	`1074`
`1074`	`1075`	`/* Aggregate final functions */`
`1075`	`1076`	`"UNION ALL "`
`@@ -1079,13 +1080,15 @@ check_for_incompatible_polymorphics(ClusterInfo *cluster)`
`1079`	`1080`	`"JOIN pg_proc AS finalfn ON finalfn.oid=a.aggfinalfn "`
`1080`	`1081`	`"WHERE p.oid >= 16384 "`
`1081`	`1082`	`"AND a.aggfinalfn = ANY(ARRAY[%s]::regprocedure[]) "`
	`1083`	`+"AND a.aggtranstype = ANY(ARRAY['anyarray', 'anyelement']::regtype[]) "`
`1082`	`1084`
`1083`	`1085`	`/* Operators */`
`1084`	`1086`	`"UNION ALL "`
`1085`	`1087`	`"SELECT 'operator' AS objkind, op.oid::regoperator::text AS objname "`
`1086`	`1088`	`"FROM pg_operator AS op "`
`1087`	`1089`	`"WHERE op.oid >= 16384 "`
`1088`		`-"AND oprcode = ANY(ARRAY[%s]::regprocedure[]);",`
	`1090`	`+"AND oprcode = ANY(ARRAY[%s]::regprocedure[]) "`
	`1091`	`+"AND oprleft = ANY(ARRAY['anyarray', 'anyelement']::regtype[]);",`
`1089`	`1092`	`old_polymorphics.data,`
`1090`	`1093`	`old_polymorphics.data,`
`1091`	`1094`	`old_polymorphics.data);`

Comments

(0)