postgres.git / summary / log / commit / refs

commit    9783413cbff9f2b4893ab81e873968905a2cfbfc
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Tue Jul 05 22:23:19 2022 +0000

    Tighten pg_upgrade's new check for non-upgradable anyarray usages.
    
    We only need to reject cases when the aggregate or operator is
    itself declared with a polymorphic type.  Per buildfarm.
    
    Discussion: https://postgr.es/m/3383880.QJadu78ljV@vejsadalnx


 src/bin/pg_upgrade/check.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/bin/pg_upgrade/check.c b/src/bin/pg_upgrade/check.c
index 0085557a9e6..cc4a4fd104e 100644
--- a/src/bin/pg_upgrade/check.c
+++ b/src/bin/pg_upgrade/check.c
@@ -1040,6 +1040,7 @@ check_for_incompatible_polymorphics(ClusterInfo *cluster)
 								"JOIN pg_proc AS transfn ON transfn.oid=a.aggtransfn "
 								"WHERE p.oid >= 16384 "
 								"AND a.aggtransfn = ANY(ARRAY[%s]::regprocedure[]) "
+								"AND a.aggtranstype = ANY(ARRAY['anyarray', 'anyelement']::regtype[]) "
 
 		/* Aggregate final functions */
 								"UNION ALL "
@@ -1049,13 +1050,15 @@ check_for_incompatible_polymorphics(ClusterInfo *cluster)
 								"JOIN pg_proc AS finalfn ON finalfn.oid=a.aggfinalfn "
 								"WHERE p.oid >= 16384 "
 								"AND a.aggfinalfn = ANY(ARRAY[%s]::regprocedure[]) "
+								"AND a.aggtranstype = ANY(ARRAY['anyarray', 'anyelement']::regtype[]) "
 
 		/* Operators */
 								"UNION ALL "
 								"SELECT 'operator' AS objkind, op.oid::regoperator::text AS objname "
 								"FROM pg_operator AS op "
 								"WHERE op.oid >= 16384 "
-								"AND oprcode = ANY(ARRAY[%s]::regprocedure[]);",
+								"AND oprcode = ANY(ARRAY[%s]::regprocedure[]) "
+								"AND oprleft = ANY(ARRAY['anyarray', 'anyelement']::regtype[]);",
 								old_polymorphics.data,
 								old_polymorphics.data,
 								old_polymorphics.data);


[parent: 175e60a5e35e]