mirror of
https://github.com/postgres/postgres.git
synced 2025-06-13 07:41:39 +03:00
One more hack to make contrib upgrades from 9.0 match fresh 9.1 installs.
intarray and tsearch2 both reference core support functions in their GIN opclasses, and the signatures of those functions changed for 9.1. We added backwards-compatible pg_proc entries for the functions in order to allow 9.0 dump files to be restored at all, but that hack leaves the opclasses pointing at pg_proc entries different from what they'd point to if the contrib modules were installed fresh in 9.1. To forestall any possibility of future problems, fix the opclasses to match fresh installs via the expedient of direct UPDATEs on pg_amproc in the update-from-unpackaged scripts. (Yech ... but the alternatives are worse, or require far more effort than seems justified right now.) Note: updating pg_amproc is sufficient because there will be no pg_depend entries corresponding to these dependencies, since the referenced functions are all pinned.
This commit is contained in:
@ -88,3 +88,21 @@ WHERE oid = 'ginint4_queryextract(internal,internal,smallint,internal,internal)'
|
||||
UPDATE pg_catalog.pg_proc
|
||||
SET pronargs = 8, proargtypes = '2281 21 2281 23 2281 2281 2281 2281'
|
||||
WHERE oid = 'ginint4_consistent(internal,smallint,internal,integer,internal,internal)'::pg_catalog.regprocedure;
|
||||
|
||||
-- intarray also relies on the core function ginarrayextract, which changed
|
||||
-- signature in 9.1. To support upgrading, pg_catalog contains entries
|
||||
-- for ginarrayextract with both 2 and 3 args, and the former is what would
|
||||
-- have been added to our opclass during initial restore of a 9.0 dump script.
|
||||
-- Avert your eyes while we hack the pg_amproc entry to make it link to the
|
||||
-- 3-arg form ...
|
||||
|
||||
UPDATE pg_catalog.pg_amproc
|
||||
SET amproc = 'pg_catalog.ginarrayextract(anyarray,internal,internal)'::pg_catalog.regprocedure
|
||||
WHERE amprocfamily =
|
||||
(SELECT oid FROM pg_catalog.pg_opfamily WHERE opfname = 'gin__int_ops' AND
|
||||
opfnamespace = (SELECT oid FROM pg_catalog.pg_namespace
|
||||
WHERE nspname = pg_catalog.current_schema()))
|
||||
AND amproclefttype = 'integer[]'::pg_catalog.regtype
|
||||
AND amprocrighttype = 'integer[]'::pg_catalog.regtype
|
||||
AND amprocnum = 2
|
||||
AND amproc = 'pg_catalog.ginarrayextract(anyarray,internal)'::pg_catalog.regprocedure;
|
||||
|
Reference in New Issue
Block a user