Handle contrib's GIN/GIST support function signature changes honestly.

In commits 9ff60273e35cad6e and dbe2328959e12701 I (tgl) fixed the
signatures of a bunch of contrib's GIN and GIST support functions so that
they would pass validation by the recently-added amvalidate functions.
The backend does not actually consult or check those signatures otherwise,
so I figured this was basically cosmetic and did not require an extension
version bump.  However, Alexander Korotkov pointed out that that would
leave us in a pretty messy situation if we ever wanted to redefine those
functions later, because there wouldn't be a unique way to name them.
Since we're going to be bumping these extensions' versions anyway for
parallel-query cleanups, let's take care of this now.

Andreas Karlsson, adjusted for more search-path-safety by me

4 files changed, 32 insertions, 3 deletions

diff --git a/contrib/ltree/Makefile b/contrib/ltree/Makefile
index a41e45723d..c101603e6c 100644
--- a/contrib/ltree/Makefile
+++ b/contrib/ltree/Makefile
@@ -6,7 +6,7 @@ OBJS = 	ltree_io.o ltree_op.o lquery_op.o _ltree_op.o crc32.o \
 PG_CPPFLAGS = -DLOWER_NODE
 
 EXTENSION = ltree
-DATA = ltree--1.0.sql ltree--unpackaged--1.0.sql
+DATA = ltree--1.1.sql ltree--1.0--1.1.sql ltree--unpackaged--1.0.sql
 PGFILEDESC = "ltree - hierarchical label data type"
 
 REGRESS = ltree
diff --git a/contrib/ltree/ltree--1.0--1.1.sql b/contrib/ltree/ltree--1.0--1.1.sql
new file mode 100644
index 0000000000..7fe61d1c25
--- /dev/null
+++ b/contrib/ltree/ltree--1.0--1.1.sql
@@ -0,0 +1,29 @@
+/* contrib/ltree/ltree--1.0--1.1.sql */
+
+-- complain if script is sourced in psql, rather than via ALTER EXTENSION
+\echo Use "ALTER EXTENSION ltree UPDATE TO '1.1'" to load this file. \quit
+
+-- Update procedure signatures the hard way.
+-- We use to_regprocedure() so that query doesn't fail if run against 9.6beta1 definitions,
+-- wherein the signatures have been updated already.  In that case to_regprocedure() will
+-- return NULL and no updates will happen.
+
+UPDATE pg_catalog.pg_proc SET
+  proargtypes = pg_catalog.array_to_string(newtypes::pg_catalog.oid[], ' ')::pg_catalog.oidvector,
+  pronargs = pg_catalog.array_length(newtypes, 1)
+FROM (VALUES
+(NULL::pg_catalog.text, NULL::pg_catalog.regtype[]), -- establish column types
+('ltree_consistent(internal,internal,int2,oid,internal)', '{internal,ltree,int2,oid,internal}'),
+('ltree_same(internal,internal,internal)', '{ltree_gist,ltree_gist,internal}'),
+('_ltree_consistent(internal,internal,int2,oid,internal)', '{internal,_ltree,int2,oid,internal}'),
+('_ltree_same(internal,internal,internal)', '{ltree_gist,ltree_gist,internal}')
+) AS update_data (oldproc, newtypes)
+WHERE oid = pg_catalog.to_regprocedure(oldproc);
+
+UPDATE pg_catalog.pg_proc SET
+  prorettype = 'ltree_gist'::pg_catalog.regtype
+WHERE oid = pg_catalog.to_regprocedure('ltree_union(internal,internal)');
+
+UPDATE pg_catalog.pg_proc SET
+  prorettype = 'ltree_gist'::pg_catalog.regtype
+WHERE oid = pg_catalog.to_regprocedure('_ltree_union(internal,internal)');
diff --git a/contrib/ltree/ltree--1.0.sql b/contrib/ltree/ltree--1.1.sql
index 94ce5d4eb0..1e04ce6489 100644
--- a/contrib/ltree/ltree--1.0.sql
+++ b/contrib/ltree/ltree--1.1.sql
@@ -1,4 +1,4 @@
-/* contrib/ltree/ltree--1.0.sql */
+/* contrib/ltree/ltree--1.1.sql */
 
 -- complain if script is sourced in psql, rather than via CREATE EXTENSION
 \echo Use "CREATE EXTENSION ltree" to load this file. \quit
diff --git a/contrib/ltree/ltree.control b/contrib/ltree/ltree.control
index d879fd618c..03c3fb1ab5 100644
--- a/contrib/ltree/ltree.control
+++ b/contrib/ltree/ltree.control
@@ -1,5 +1,5 @@
 # ltree extension
 comment = 'data type for hierarchical tree-like structures'
-default_version = '1.0'
+default_version = '1.1'
 module_pathname = '$libdir/ltree'
 relocatable = true