From 749a787c5b25ae33b3d4da0ef12aa05214aa73c7 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Thu, 9 Jun 2016 16:44:25 -0400
Subject: [PATCH] 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
---
 contrib/btree_gist/Makefile                   |  4 +-
 contrib/btree_gist/btree_gist--1.1--1.2.sql   | 63 +++++++++++++++++++
 ...tree_gist--1.1.sql => btree_gist--1.2.sql} |  2 +-
 contrib/btree_gist/btree_gist.control         |  2 +-
 contrib/cube/Makefile                         |  3 +-
 contrib/cube/cube--1.1--1.2.sql               | 19 ++++++
 contrib/cube/{cube--1.1.sql => cube--1.2.sql} |  2 +-
 contrib/cube/cube.control                     |  2 +-
 contrib/hstore/Makefile                       |  2 +-
 contrib/hstore/hstore--1.3--1.4.sql           | 26 ++++++++
 .../{hstore--1.3.sql => hstore--1.4.sql}      |  2 +-
 contrib/hstore/hstore.control                 |  2 +-
 contrib/intarray/Makefile                     |  3 +-
 contrib/intarray/intarray--1.1--1.2.sql       | 26 ++++++++
 .../{intarray--1.1.sql => intarray--1.2.sql}  |  2 +-
 contrib/intarray/intarray.control             |  2 +-
 contrib/ltree/Makefile                        |  2 +-
 contrib/ltree/ltree--1.0--1.1.sql             | 29 +++++++++
 .../ltree/{ltree--1.0.sql => ltree--1.1.sql}  |  2 +-
 contrib/ltree/ltree.control                   |  2 +-
 contrib/pg_trgm/Makefile                      |  3 +-
 contrib/pg_trgm/pg_trgm--1.2--1.3.sql         | 24 +++++++
 .../{pg_trgm--1.2.sql => pg_trgm--1.3.sql}    |  2 +-
 contrib/pg_trgm/pg_trgm.control               |  2 +-
 contrib/seg/Makefile                          |  2 +-
 contrib/seg/seg--1.0--1.1.sql                 | 18 ++++++
 contrib/seg/{seg--1.0.sql => seg--1.1.sql}    |  2 +-
 contrib/seg/seg.control                       |  2 +-
 28 files changed, 230 insertions(+), 22 deletions(-)
 create mode 100644 contrib/btree_gist/btree_gist--1.1--1.2.sql
 rename contrib/btree_gist/{btree_gist--1.1.sql => btree_gist--1.2.sql} (99%)
 create mode 100644 contrib/cube/cube--1.1--1.2.sql
 rename contrib/cube/{cube--1.1.sql => cube--1.2.sql} (99%)
 create mode 100644 contrib/hstore/hstore--1.3--1.4.sql
 rename contrib/hstore/{hstore--1.3.sql => hstore--1.4.sql} (99%)
 create mode 100644 contrib/intarray/intarray--1.1--1.2.sql
 rename contrib/intarray/{intarray--1.1.sql => intarray--1.2.sql} (99%)
 create mode 100644 contrib/ltree/ltree--1.0--1.1.sql
 rename contrib/ltree/{ltree--1.0.sql => ltree--1.1.sql} (99%)
 create mode 100644 contrib/pg_trgm/pg_trgm--1.2--1.3.sql
 rename contrib/pg_trgm/{pg_trgm--1.2.sql => pg_trgm--1.3.sql} (99%)
 create mode 100644 contrib/seg/seg--1.0--1.1.sql
 rename contrib/seg/{seg--1.0.sql => seg--1.1.sql} (99%)

diff --git a/contrib/btree_gist/Makefile b/contrib/btree_gist/Makefile
index a4b2cc7ef5..5134f72611 100644
--- a/contrib/btree_gist/Makefile
+++ b/contrib/btree_gist/Makefile
@@ -9,8 +9,8 @@ OBJS =  btree_gist.o btree_utils_num.o btree_utils_var.o btree_int2.o \
         btree_numeric.o $(WIN32RES)
 
 EXTENSION = btree_gist
-DATA = btree_gist--1.1.sql btree_gist--unpackaged--1.0.sql \
-	btree_gist--1.0--1.1.sql
+DATA = btree_gist--1.2.sql btree_gist--1.1--1.2.sql btree_gist--1.0--1.1.sql \
+	btree_gist--unpackaged--1.0.sql
 PGFILEDESC = "btree_gist - B-tree equivalent GiST operator classes"
 
 REGRESS = init int2 int4 int8 float4 float8 cash oid timestamp timestamptz \
diff --git a/contrib/btree_gist/btree_gist--1.1--1.2.sql b/contrib/btree_gist/btree_gist--1.1--1.2.sql
new file mode 100644
index 0000000000..8487f9bfc8
--- /dev/null
+++ b/contrib/btree_gist/btree_gist--1.1--1.2.sql
@@ -0,0 +1,63 @@
+/* contrib/btree_gist/btree_gist--1.1--1.2.sql */
+
+-- complain if script is sourced in psql, rather than via ALTER EXTENSION
+\echo Use "ALTER EXTENSION btree_gist UPDATE TO '1.2'" 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
+('gbt_oid_distance(internal,oid,int2,oid)', '{internal,oid,int2,oid,internal}'),
+('gbt_oid_union(bytea,internal)', '{internal,internal}'),
+('gbt_oid_same(internal,internal,internal)', '{gbtreekey8,gbtreekey8,internal}'),
+('gbt_int2_distance(internal,int2,int2,oid)', '{internal,int2,int2,oid,internal}'),
+('gbt_int2_union(bytea,internal)', '{internal,internal}'),
+('gbt_int2_same(internal,internal,internal)', '{gbtreekey4,gbtreekey4,internal}'),
+('gbt_int4_distance(internal,int4,int2,oid)', '{internal,int4,int2,oid,internal}'),
+('gbt_int4_union(bytea,internal)', '{internal,internal}'),
+('gbt_int4_same(internal,internal,internal)', '{gbtreekey8,gbtreekey8,internal}'),
+('gbt_int8_distance(internal,int8,int2,oid)', '{internal,int8,int2,oid,internal}'),
+('gbt_int8_union(bytea,internal)', '{internal,internal}'),
+('gbt_int8_same(internal,internal,internal)', '{gbtreekey16,gbtreekey16,internal}'),
+('gbt_float4_distance(internal,float4,int2,oid)', '{internal,float4,int2,oid,internal}'),
+('gbt_float4_union(bytea,internal)', '{internal,internal}'),
+('gbt_float4_same(internal,internal,internal)', '{gbtreekey8,gbtreekey8,internal}'),
+('gbt_float8_distance(internal,float8,int2,oid)', '{internal,float8,int2,oid,internal}'),
+('gbt_float8_union(bytea,internal)', '{internal,internal}'),
+('gbt_float8_same(internal,internal,internal)', '{gbtreekey16,gbtreekey16,internal}'),
+('gbt_ts_distance(internal,timestamp,int2,oid)', '{internal,timestamp,int2,oid,internal}'),
+('gbt_tstz_distance(internal,timestamptz,int2,oid)', '{internal,timestamptz,int2,oid,internal}'),
+('gbt_ts_union(bytea,internal)', '{internal,internal}'),
+('gbt_ts_same(internal,internal,internal)', '{gbtreekey16,gbtreekey16,internal}'),
+('gbt_time_distance(internal,time,int2,oid)', '{internal,time,int2,oid,internal}'),
+('gbt_time_union(bytea,internal)', '{internal,internal}'),
+('gbt_time_same(internal,internal,internal)', '{gbtreekey16,gbtreekey16,internal}'),
+('gbt_date_distance(internal,date,int2,oid)', '{internal,date,int2,oid,internal}'),
+('gbt_date_union(bytea,internal)', '{internal,internal}'),
+('gbt_date_same(internal,internal,internal)', '{gbtreekey8,gbtreekey8,internal}'),
+('gbt_intv_distance(internal,interval,int2,oid)', '{internal,interval,int2,oid,internal}'),
+('gbt_intv_union(bytea,internal)', '{internal,internal}'),
+('gbt_intv_same(internal,internal,internal)', '{gbtreekey32,gbtreekey32,internal}'),
+('gbt_cash_distance(internal,money,int2,oid)', '{internal,money,int2,oid,internal}'),
+('gbt_cash_union(bytea,internal)', '{internal,internal}'),
+('gbt_cash_same(internal,internal,internal)', '{gbtreekey16,gbtreekey16,internal}'),
+('gbt_macad_union(bytea,internal)', '{internal,internal}'),
+('gbt_macad_same(internal,internal,internal)', '{gbtreekey16,gbtreekey16,internal}'),
+('gbt_text_union(bytea,internal)', '{internal,internal}'),
+('gbt_text_same(internal,internal,internal)', '{gbtreekey_var,gbtreekey_var,internal}'),
+('gbt_bytea_union(bytea,internal)', '{internal,internal}'),
+('gbt_bytea_same(internal,internal,internal)', '{gbtreekey_var,gbtreekey_var,internal}'),
+('gbt_numeric_union(bytea,internal)', '{internal,internal}'),
+('gbt_numeric_same(internal,internal,internal)', '{gbtreekey_var,gbtreekey_var,internal}'),
+('gbt_bit_union(bytea,internal)', '{internal,internal}'),
+('gbt_bit_same(internal,internal,internal)', '{gbtreekey_var,gbtreekey_var,internal}'),
+('gbt_inet_union(bytea,internal)', '{internal,internal}'),
+('gbt_inet_same(internal,internal,internal)', '{gbtreekey16,gbtreekey16,internal}')
+) AS update_data (oldproc, newtypes)
+WHERE oid = pg_catalog.to_regprocedure(oldproc);
diff --git a/contrib/btree_gist/btree_gist--1.1.sql b/contrib/btree_gist/btree_gist--1.2.sql
similarity index 99%
rename from contrib/btree_gist/btree_gist--1.1.sql
rename to contrib/btree_gist/btree_gist--1.2.sql
index f0a4682d9b..1efe753043 100644
--- a/contrib/btree_gist/btree_gist--1.1.sql
+++ b/contrib/btree_gist/btree_gist--1.2.sql
@@ -1,4 +1,4 @@
-/* contrib/btree_gist/btree_gist--1.0.sql */
+/* contrib/btree_gist/btree_gist--1.2.sql */
 
 -- complain if script is sourced in psql, rather than via CREATE EXTENSION
 \echo Use "CREATE EXTENSION btree_gist" to load this file. \quit
diff --git a/contrib/btree_gist/btree_gist.control b/contrib/btree_gist/btree_gist.control
index c7adfeb358..74d0e92591 100644
--- a/contrib/btree_gist/btree_gist.control
+++ b/contrib/btree_gist/btree_gist.control
@@ -1,5 +1,5 @@
 # btree_gist extension
 comment = 'support for indexing common datatypes in GiST'
-default_version = '1.1'
+default_version = '1.2'
 module_pathname = '$libdir/btree_gist'
 relocatable = true
diff --git a/contrib/cube/Makefile b/contrib/cube/Makefile
index e2a5d2c992..be7a1bc1a0 100644
--- a/contrib/cube/Makefile
+++ b/contrib/cube/Makefile
@@ -4,7 +4,8 @@ MODULE_big = cube
 OBJS= cube.o cubeparse.o $(WIN32RES)
 
 EXTENSION = cube
-DATA = cube--1.1.sql cube--1.0--1.1.sql cube--unpackaged--1.0.sql
+DATA = cube--1.2.sql cube--1.1--1.2.sql cube--1.0--1.1.sql \
+	cube--unpackaged--1.0.sql
 PGFILEDESC = "cube - multidimensional cube data type"
 
 REGRESS = cube
diff --git a/contrib/cube/cube--1.1--1.2.sql b/contrib/cube/cube--1.1--1.2.sql
new file mode 100644
index 0000000000..23280868eb
--- /dev/null
+++ b/contrib/cube/cube--1.1--1.2.sql
@@ -0,0 +1,19 @@
+/* contrib/cube/cube--1.1--1.2.sql */
+
+-- complain if script is sourced in psql, rather than via ALTER EXTENSION
+\echo Use "ALTER EXTENSION cube UPDATE TO '1.2'" 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
+('g_cube_consistent(internal,cube,int4,oid,internal)', '{internal,cube,int2,oid,internal}'),
+('g_cube_distance(internal,cube,smallint,oid)', '{internal,cube,smallint,oid,internal}')
+) AS update_data (oldproc, newtypes)
+WHERE oid = pg_catalog.to_regprocedure(oldproc);
diff --git a/contrib/cube/cube--1.1.sql b/contrib/cube/cube--1.2.sql
similarity index 99%
rename from contrib/cube/cube--1.1.sql
rename to contrib/cube/cube--1.2.sql
index 92d4c0ebae..0a40e48b49 100644
--- a/contrib/cube/cube--1.1.sql
+++ b/contrib/cube/cube--1.2.sql
@@ -1,4 +1,4 @@
-/* contrib/cube/cube--1.1.sql */
+/* contrib/cube/cube--1.2.sql */
 
 -- complain if script is sourced in psql, rather than via CREATE EXTENSION
 \echo Use "CREATE EXTENSION cube" to load this file. \quit
diff --git a/contrib/cube/cube.control b/contrib/cube/cube.control
index f84e6c582e..b03cfa0a58 100644
--- a/contrib/cube/cube.control
+++ b/contrib/cube/cube.control
@@ -1,5 +1,5 @@
 # cube extension
 comment = 'data type for multidimensional cubes'
-default_version = '1.1'
+default_version = '1.2'
 module_pathname = '$libdir/cube'
 relocatable = true
diff --git a/contrib/hstore/Makefile b/contrib/hstore/Makefile
index 82908de9da..311cc099e5 100644
--- a/contrib/hstore/Makefile
+++ b/contrib/hstore/Makefile
@@ -5,7 +5,7 @@ OBJS = hstore_io.o hstore_op.o hstore_gist.o hstore_gin.o hstore_compat.o \
 	$(WIN32RES)
 
 EXTENSION = hstore
-DATA = hstore--1.3.sql hstore--1.2--1.3.sql \
+DATA = hstore--1.4.sql hstore--1.3--1.4.sql hstore--1.2--1.3.sql \
 	hstore--1.1--1.2.sql hstore--1.0--1.1.sql \
 	hstore--unpackaged--1.0.sql
 PGFILEDESC = "hstore - key/value pair data type"
diff --git a/contrib/hstore/hstore--1.3--1.4.sql b/contrib/hstore/hstore--1.3--1.4.sql
new file mode 100644
index 0000000000..3c2bbf6191
--- /dev/null
+++ b/contrib/hstore/hstore--1.3--1.4.sql
@@ -0,0 +1,26 @@
+/* contrib/hstore/hstore--1.3--1.4.sql */
+
+-- complain if script is sourced in psql, rather than via ALTER EXTENSION
+\echo Use "ALTER EXTENSION hstore UPDATE TO '1.4'" 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
+('ghstore_same(internal,internal,internal)', '{ghstore,ghstore,internal}'),
+('ghstore_consistent(internal,internal,int4,oid,internal)', '{internal,hstore,int2,oid,internal}'),
+('gin_extract_hstore(internal,internal)', '{hstore,internal}'),
+('gin_extract_hstore_query(internal,internal,int2,internal,internal)', '{hstore,internal,int2,internal,internal}'),
+('gin_consistent_hstore(internal,int2,internal,int4,internal,internal)', '{internal,int2,hstore,int4,internal,internal}')
+) AS update_data (oldproc, newtypes)
+WHERE oid = pg_catalog.to_regprocedure(oldproc);
+
+UPDATE pg_catalog.pg_proc SET
+  prorettype = 'ghstore'::pg_catalog.regtype
+WHERE oid = pg_catalog.to_regprocedure('ghstore_union(internal,internal)');
diff --git a/contrib/hstore/hstore--1.3.sql b/contrib/hstore/hstore--1.4.sql
similarity index 99%
rename from contrib/hstore/hstore--1.3.sql
rename to contrib/hstore/hstore--1.4.sql
index b9b478d039..2002969eec 100644
--- a/contrib/hstore/hstore--1.3.sql
+++ b/contrib/hstore/hstore--1.4.sql
@@ -1,4 +1,4 @@
-/* contrib/hstore/hstore--1.3.sql */
+/* contrib/hstore/hstore--1.4.sql */
 
 -- complain if script is sourced in psql, rather than via CREATE EXTENSION
 \echo Use "CREATE EXTENSION hstore" to load this file. \quit
diff --git a/contrib/hstore/hstore.control b/contrib/hstore/hstore.control
index dcc3b687cf..f99a937acc 100644
--- a/contrib/hstore/hstore.control
+++ b/contrib/hstore/hstore.control
@@ -1,5 +1,5 @@
 # hstore extension
 comment = 'data type for storing sets of (key, value) pairs'
-default_version = '1.3'
+default_version = '1.4'
 module_pathname = '$libdir/hstore'
 relocatable = true
diff --git a/contrib/intarray/Makefile b/contrib/intarray/Makefile
index 5ea7f2aedf..250529432f 100644
--- a/contrib/intarray/Makefile
+++ b/contrib/intarray/Makefile
@@ -5,7 +5,8 @@ OBJS = _int_bool.o _int_gist.o _int_op.o _int_tool.o \
 	_intbig_gist.o _int_gin.o _int_selfuncs.o $(WIN32RES)
 
 EXTENSION = intarray
-DATA = intarray--1.1.sql intarray--1.0--1.1.sql intarray--unpackaged--1.0.sql
+DATA = intarray--1.2.sql intarray--1.1--1.2.sql intarray--1.0--1.1.sql \
+	intarray--unpackaged--1.0.sql
 PGFILEDESC = "intarray - functions and operators for arrays of integers"
 
 REGRESS = _int
diff --git a/contrib/intarray/intarray--1.1--1.2.sql b/contrib/intarray/intarray--1.1--1.2.sql
new file mode 100644
index 0000000000..84db80618d
--- /dev/null
+++ b/contrib/intarray/intarray--1.1--1.2.sql
@@ -0,0 +1,26 @@
+/* contrib/intarray/intarray--1.1--1.2.sql */
+
+-- complain if script is sourced in psql, rather than via ALTER EXTENSION
+\echo Use "ALTER EXTENSION intarray UPDATE TO '1.2'" 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
+('g_int_consistent(internal,_int4,int4,oid,internal)', '{internal,_int4,int2,oid,internal}'),
+('g_intbig_consistent(internal,internal,int4,oid,internal)', '{internal,_int4,int2,oid,internal}'),
+('g_intbig_same(internal,internal,internal)', '{intbig_gkey,intbig_gkey,internal}'),
+('ginint4_queryextract(internal,internal,int2,internal,internal,internal,internal)', '{_int4,internal,int2,internal,internal,internal,internal}'),
+('ginint4_consistent(internal,int2,internal,int4,internal,internal,internal,internal)', '{internal,int2,_int4,int4,internal,internal,internal,internal}')
+) AS update_data (oldproc, newtypes)
+WHERE oid = pg_catalog.to_regprocedure(oldproc);
+
+UPDATE pg_catalog.pg_proc SET
+  prorettype = 'intbig_gkey'::pg_catalog.regtype
+WHERE oid = pg_catalog.to_regprocedure('g_intbig_union(internal,internal)');
diff --git a/contrib/intarray/intarray--1.1.sql b/contrib/intarray/intarray--1.2.sql
similarity index 99%
rename from contrib/intarray/intarray--1.1.sql
rename to contrib/intarray/intarray--1.2.sql
index 6ee0d5a625..16d0bc4ef2 100644
--- a/contrib/intarray/intarray--1.1.sql
+++ b/contrib/intarray/intarray--1.2.sql
@@ -1,4 +1,4 @@
-/* contrib/intarray/intarray--1.1.sql */
+/* contrib/intarray/intarray--1.2.sql */
 
 -- complain if script is sourced in psql, rather than via CREATE EXTENSION
 \echo Use "CREATE EXTENSION intarray" to load this file. \quit
diff --git a/contrib/intarray/intarray.control b/contrib/intarray/intarray.control
index 8c23e8d5e2..7e50cc30f6 100644
--- a/contrib/intarray/intarray.control
+++ b/contrib/intarray/intarray.control
@@ -1,5 +1,5 @@
 # intarray extension
 comment = 'functions, operators, and index support for 1-D arrays of integers'
-default_version = '1.1'
+default_version = '1.2'
 module_pathname = '$libdir/_int'
 relocatable = true
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
similarity index 99%
rename from contrib/ltree/ltree--1.0.sql
rename to 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
diff --git a/contrib/pg_trgm/Makefile b/contrib/pg_trgm/Makefile
index c0c78f3459..212a89039a 100644
--- a/contrib/pg_trgm/Makefile
+++ b/contrib/pg_trgm/Makefile
@@ -4,7 +4,8 @@ MODULE_big = pg_trgm
 OBJS = trgm_op.o trgm_gist.o trgm_gin.o trgm_regexp.o $(WIN32RES)
 
 EXTENSION = pg_trgm
-DATA = pg_trgm--1.2.sql pg_trgm--1.0--1.1.sql pg_trgm--1.1--1.2.sql pg_trgm--unpackaged--1.0.sql
+DATA = pg_trgm--1.3.sql pg_trgm--1.2--1.3.sql pg_trgm--1.1--1.2.sql \
+	pg_trgm--1.0--1.1.sql pg_trgm--unpackaged--1.0.sql
 PGFILEDESC = "pg_trgm - trigram matching"
 
 REGRESS = pg_trgm pg_word_trgm
diff --git a/contrib/pg_trgm/pg_trgm--1.2--1.3.sql b/contrib/pg_trgm/pg_trgm--1.2--1.3.sql
new file mode 100644
index 0000000000..a647c7eeb2
--- /dev/null
+++ b/contrib/pg_trgm/pg_trgm--1.2--1.3.sql
@@ -0,0 +1,24 @@
+/* contrib/pg_trgm/pg_trgm--1.2--1.3.sql */
+
+-- complain if script is sourced in psql, rather than via ALTER EXTENSION
+\echo Use "ALTER EXTENSION pg_trgm UPDATE TO '1.3'" 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
+('gtrgm_consistent(internal,text,int4,oid,internal)', '{internal,text,int2,oid,internal}'),
+('gtrgm_distance(internal,text,int4,oid)', '{internal,text,int2,oid,internal}'),
+('gtrgm_union(bytea,internal)', '{internal,internal}')
+) AS update_data (oldproc, newtypes)
+WHERE oid = pg_catalog.to_regprocedure(oldproc);
+
+UPDATE pg_catalog.pg_proc SET
+  prorettype = 'gtrgm'::pg_catalog.regtype
+WHERE oid = pg_catalog.to_regprocedure('gtrgm_union(internal,internal)');
diff --git a/contrib/pg_trgm/pg_trgm--1.2.sql b/contrib/pg_trgm/pg_trgm--1.3.sql
similarity index 99%
rename from contrib/pg_trgm/pg_trgm--1.2.sql
rename to contrib/pg_trgm/pg_trgm--1.3.sql
index bc23dfe0f3..8b8be3c472 100644
--- a/contrib/pg_trgm/pg_trgm--1.2.sql
+++ b/contrib/pg_trgm/pg_trgm--1.3.sql
@@ -1,4 +1,4 @@
-/* contrib/pg_trgm/pg_trgm--1.2.sql */
+/* contrib/pg_trgm/pg_trgm--1.3.sql */
 
 -- complain if script is sourced in psql, rather than via CREATE EXTENSION
 \echo Use "CREATE EXTENSION pg_trgm" to load this file. \quit
diff --git a/contrib/pg_trgm/pg_trgm.control b/contrib/pg_trgm/pg_trgm.control
index cbf5a186d7..06f274f01a 100644
--- a/contrib/pg_trgm/pg_trgm.control
+++ b/contrib/pg_trgm/pg_trgm.control
@@ -1,5 +1,5 @@
 # pg_trgm extension
 comment = 'text similarity measurement and index searching based on trigrams'
-default_version = '1.2'
+default_version = '1.3'
 module_pathname = '$libdir/pg_trgm'
 relocatable = true
diff --git a/contrib/seg/Makefile b/contrib/seg/Makefile
index d6de8a2444..c8f0f8b9a2 100644
--- a/contrib/seg/Makefile
+++ b/contrib/seg/Makefile
@@ -4,7 +4,7 @@ MODULE_big = seg
 OBJS = seg.o segparse.o $(WIN32RES)
 
 EXTENSION = seg
-DATA = seg--1.0.sql seg--unpackaged--1.0.sql
+DATA = seg--1.1.sql seg--1.0--1.1.sql seg--unpackaged--1.0.sql
 PGFILEDESC = "seg - line segment data type"
 
 REGRESS = seg
diff --git a/contrib/seg/seg--1.0--1.1.sql b/contrib/seg/seg--1.0--1.1.sql
new file mode 100644
index 0000000000..ef06f359ec
--- /dev/null
+++ b/contrib/seg/seg--1.0--1.1.sql
@@ -0,0 +1,18 @@
+/* contrib/seg/seg--1.0--1.1.sql */
+
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "ALTER EXTENSION seg 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
+('gseg_consistent(internal,seg,int4,oid,internal)', '{internal,seg,int2,oid,internal}')
+) AS update_data (oldproc, newtypes)
+WHERE oid = pg_catalog.to_regprocedure(oldproc);
diff --git a/contrib/seg/seg--1.0.sql b/contrib/seg/seg--1.1.sql
similarity index 99%
rename from contrib/seg/seg--1.0.sql
rename to contrib/seg/seg--1.1.sql
index 0de0d46167..a1550ab9e0 100644
--- a/contrib/seg/seg--1.0.sql
+++ b/contrib/seg/seg--1.1.sql
@@ -1,4 +1,4 @@
-/* contrib/seg/seg--1.0.sql */
+/* contrib/seg/seg--1.1.sql */
 
 -- complain if script is sourced in psql, rather than via CREATE EXTENSION
 \echo Use "CREATE EXTENSION seg" to load this file. \quit
diff --git a/contrib/seg/seg.control b/contrib/seg/seg.control
index a1286962ee..f210cf5e04 100644
--- a/contrib/seg/seg.control
+++ b/contrib/seg/seg.control
@@ -1,5 +1,5 @@
 # seg extension
 comment = 'data type for representing line segments or floating-point intervals'
-default_version = '1.0'
+default_version = '1.1'
 module_pathname = '$libdir/seg'
 relocatable = true