Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 749a787

Browse files
committed
Handle contrib's GIN/GIST support function signature changes honestly.
In commits 9ff6027 and dbe2328 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
1 parent b12fd41 commit 749a787

28 files changed

+230
-22
lines changed

contrib/btree_gist/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ OBJS = btree_gist.o btree_utils_num.o btree_utils_var.o btree_int2.o \
99
btree_numeric.o $(WIN32RES)
1010

1111
EXTENSION = btree_gist
12-
DATA = btree_gist--1.1.sql btree_gist--unpackaged--1.0.sql \
13-
btree_gist--1.0--1.1.sql
12+
DATA = btree_gist--1.2.sql btree_gist--1.1--1.2.sql btree_gist--1.0--1.1.sql \
13+
btree_gist--unpackaged--1.0.sql
1414
PGFILEDESC = "btree_gist - B-tree equivalent GiST operator classes"
1515

1616
REGRESS = init int2 int4 int8 float4 float8 cash oid timestamp timestamptz \
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
/* contrib/btree_gist/btree_gist--1.1--1.2.sql */
2+
3+
-- complain if script is sourced in psql, rather than via ALTER EXTENSION
4+
\echo Use "ALTER EXTENSION btree_gist UPDATE TO '1.2'" to load this file. \quit
5+
6+
-- Update procedure signatures the hard way.
7+
-- We use to_regprocedure() so that query doesn't fail if run against 9.6beta1 definitions,
8+
-- wherein the signatures have been updated already. In that case to_regprocedure() will
9+
-- return NULL and no updates will happen.
10+
11+
UPDATE pg_catalog.pg_proc SET
12+
proargtypes = pg_catalog.array_to_string(newtypes::pg_catalog.oid[], ' ')::pg_catalog.oidvector,
13+
pronargs = pg_catalog.array_length(newtypes, 1)
14+
FROM (VALUES
15+
(NULL::pg_catalog.text, NULL::pg_catalog.regtype[]), -- establish column types
16+
('gbt_oid_distance(internal,oid,int2,oid)', '{internal,oid,int2,oid,internal}'),
17+
('gbt_oid_union(bytea,internal)', '{internal,internal}'),
18+
('gbt_oid_same(internal,internal,internal)', '{gbtreekey8,gbtreekey8,internal}'),
19+
('gbt_int2_distance(internal,int2,int2,oid)', '{internal,int2,int2,oid,internal}'),
20+
('gbt_int2_union(bytea,internal)', '{internal,internal}'),
21+
('gbt_int2_same(internal,internal,internal)', '{gbtreekey4,gbtreekey4,internal}'),
22+
('gbt_int4_distance(internal,int4,int2,oid)', '{internal,int4,int2,oid,internal}'),
23+
('gbt_int4_union(bytea,internal)', '{internal,internal}'),
24+
('gbt_int4_same(internal,internal,internal)', '{gbtreekey8,gbtreekey8,internal}'),
25+
('gbt_int8_distance(internal,int8,int2,oid)', '{internal,int8,int2,oid,internal}'),
26+
('gbt_int8_union(bytea,internal)', '{internal,internal}'),
27+
('gbt_int8_same(internal,internal,internal)', '{gbtreekey16,gbtreekey16,internal}'),
28+
('gbt_float4_distance(internal,float4,int2,oid)', '{internal,float4,int2,oid,internal}'),
29+
('gbt_float4_union(bytea,internal)', '{internal,internal}'),
30+
('gbt_float4_same(internal,internal,internal)', '{gbtreekey8,gbtreekey8,internal}'),
31+
('gbt_float8_distance(internal,float8,int2,oid)', '{internal,float8,int2,oid,internal}'),
32+
('gbt_float8_union(bytea,internal)', '{internal,internal}'),
33+
('gbt_float8_same(internal,internal,internal)', '{gbtreekey16,gbtreekey16,internal}'),
34+
('gbt_ts_distance(internal,timestamp,int2,oid)', '{internal,timestamp,int2,oid,internal}'),
35+
('gbt_tstz_distance(internal,timestamptz,int2,oid)', '{internal,timestamptz,int2,oid,internal}'),
36+
('gbt_ts_union(bytea,internal)', '{internal,internal}'),
37+
('gbt_ts_same(internal,internal,internal)', '{gbtreekey16,gbtreekey16,internal}'),
38+
('gbt_time_distance(internal,time,int2,oid)', '{internal,time,int2,oid,internal}'),
39+
('gbt_time_union(bytea,internal)', '{internal,internal}'),
40+
('gbt_time_same(internal,internal,internal)', '{gbtreekey16,gbtreekey16,internal}'),
41+
('gbt_date_distance(internal,date,int2,oid)', '{internal,date,int2,oid,internal}'),
42+
('gbt_date_union(bytea,internal)', '{internal,internal}'),
43+
('gbt_date_same(internal,internal,internal)', '{gbtreekey8,gbtreekey8,internal}'),
44+
('gbt_intv_distance(internal,interval,int2,oid)', '{internal,interval,int2,oid,internal}'),
45+
('gbt_intv_union(bytea,internal)', '{internal,internal}'),
46+
('gbt_intv_same(internal,internal,internal)', '{gbtreekey32,gbtreekey32,internal}'),
47+
('gbt_cash_distance(internal,money,int2,oid)', '{internal,money,int2,oid,internal}'),
48+
('gbt_cash_union(bytea,internal)', '{internal,internal}'),
49+
('gbt_cash_same(internal,internal,internal)', '{gbtreekey16,gbtreekey16,internal}'),
50+
('gbt_macad_union(bytea,internal)', '{internal,internal}'),
51+
('gbt_macad_same(internal,internal,internal)', '{gbtreekey16,gbtreekey16,internal}'),
52+
('gbt_text_union(bytea,internal)', '{internal,internal}'),
53+
('gbt_text_same(internal,internal,internal)', '{gbtreekey_var,gbtreekey_var,internal}'),
54+
('gbt_bytea_union(bytea,internal)', '{internal,internal}'),
55+
('gbt_bytea_same(internal,internal,internal)', '{gbtreekey_var,gbtreekey_var,internal}'),
56+
('gbt_numeric_union(bytea,internal)', '{internal,internal}'),
57+
('gbt_numeric_same(internal,internal,internal)', '{gbtreekey_var,gbtreekey_var,internal}'),
58+
('gbt_bit_union(bytea,internal)', '{internal,internal}'),
59+
('gbt_bit_same(internal,internal,internal)', '{gbtreekey_var,gbtreekey_var,internal}'),
60+
('gbt_inet_union(bytea,internal)', '{internal,internal}'),
61+
('gbt_inet_same(internal,internal,internal)', '{gbtreekey16,gbtreekey16,internal}')
62+
) AS update_data (oldproc, newtypes)
63+
WHERE oid = pg_catalog.to_regprocedure(oldproc);

contrib/btree_gist/btree_gist--1.1.sql renamed to contrib/btree_gist/btree_gist--1.2.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* contrib/btree_gist/btree_gist--1.0.sql */
1+
/* contrib/btree_gist/btree_gist--1.2.sql */
22

33
-- complain if script is sourced in psql, rather than via CREATE EXTENSION
44
\echo Use "CREATE EXTENSION btree_gist" to load this file. \quit

contrib/btree_gist/btree_gist.control

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# btree_gist extension
22
comment = 'support for indexing common datatypes in GiST'
3-
default_version = '1.1'
3+
default_version = '1.2'
44
module_pathname = '$libdir/btree_gist'
55
relocatable = true

contrib/cube/Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ MODULE_big = cube
44
OBJS= cube.o cubeparse.o $(WIN32RES)
55

66
EXTENSION = cube
7-
DATA = cube--1.1.sql cube--1.0--1.1.sql cube--unpackaged--1.0.sql
7+
DATA = cube--1.2.sql cube--1.1--1.2.sql cube--1.0--1.1.sql \
8+
cube--unpackaged--1.0.sql
89
PGFILEDESC = "cube - multidimensional cube data type"
910

1011
REGRESS = cube

contrib/cube/cube--1.1--1.2.sql

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
/* contrib/cube/cube--1.1--1.2.sql */
2+
3+
-- complain if script is sourced in psql, rather than via ALTER EXTENSION
4+
\echo Use "ALTER EXTENSION cube UPDATE TO '1.2'" to load this file. \quit
5+
6+
-- Update procedure signatures the hard way.
7+
-- We use to_regprocedure() so that query doesn't fail if run against 9.6beta1 definitions,
8+
-- wherein the signatures have been updated already. In that case to_regprocedure() will
9+
-- return NULL and no updates will happen.
10+
11+
UPDATE pg_catalog.pg_proc SET
12+
proargtypes = pg_catalog.array_to_string(newtypes::pg_catalog.oid[], ' ')::pg_catalog.oidvector,
13+
pronargs = pg_catalog.array_length(newtypes, 1)
14+
FROM (VALUES
15+
(NULL::pg_catalog.text, NULL::pg_catalog.regtype[]), -- establish column types
16+
('g_cube_consistent(internal,cube,int4,oid,internal)', '{internal,cube,int2,oid,internal}'),
17+
('g_cube_distance(internal,cube,smallint,oid)', '{internal,cube,smallint,oid,internal}')
18+
) AS update_data (oldproc, newtypes)
19+
WHERE oid = pg_catalog.to_regprocedure(oldproc);

contrib/cube/cube--1.1.sql renamed to contrib/cube/cube--1.2.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* contrib/cube/cube--1.1.sql */
1+
/* contrib/cube/cube--1.2.sql */
22

33
-- complain if script is sourced in psql, rather than via CREATE EXTENSION
44
\echo Use "CREATE EXTENSION cube" to load this file. \quit

contrib/cube/cube.control

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# cube extension
22
comment = 'data type for multidimensional cubes'
3-
default_version = '1.1'
3+
default_version = '1.2'
44
module_pathname = '$libdir/cube'
55
relocatable = true

contrib/hstore/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ OBJS = hstore_io.o hstore_op.o hstore_gist.o hstore_gin.o hstore_compat.o \
55
$(WIN32RES)
66

77
EXTENSION = hstore
8-
DATA = hstore--1.3.sql hstore--1.2--1.3.sql \
8+
DATA = hstore--1.4.sql hstore--1.3--1.4.sql hstore--1.2--1.3.sql \
99
hstore--1.1--1.2.sql hstore--1.0--1.1.sql \
1010
hstore--unpackaged--1.0.sql
1111
PGFILEDESC = "hstore - key/value pair data type"

contrib/hstore/hstore--1.3--1.4.sql

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
/* contrib/hstore/hstore--1.3--1.4.sql */
2+
3+
-- complain if script is sourced in psql, rather than via ALTER EXTENSION
4+
\echo Use "ALTER EXTENSION hstore UPDATE TO '1.4'" to load this file. \quit
5+
6+
-- Update procedure signatures the hard way.
7+
-- We use to_regprocedure() so that query doesn't fail if run against 9.6beta1 definitions,
8+
-- wherein the signatures have been updated already. In that case to_regprocedure() will
9+
-- return NULL and no updates will happen.
10+
11+
UPDATE pg_catalog.pg_proc SET
12+
proargtypes = pg_catalog.array_to_string(newtypes::pg_catalog.oid[], ' ')::pg_catalog.oidvector,
13+
pronargs = pg_catalog.array_length(newtypes, 1)
14+
FROM (VALUES
15+
(NULL::pg_catalog.text, NULL::pg_catalog.regtype[]), -- establish column types
16+
('ghstore_same(internal,internal,internal)', '{ghstore,ghstore,internal}'),
17+
('ghstore_consistent(internal,internal,int4,oid,internal)', '{internal,hstore,int2,oid,internal}'),
18+
('gin_extract_hstore(internal,internal)', '{hstore,internal}'),
19+
('gin_extract_hstore_query(internal,internal,int2,internal,internal)', '{hstore,internal,int2,internal,internal}'),
20+
('gin_consistent_hstore(internal,int2,internal,int4,internal,internal)', '{internal,int2,hstore,int4,internal,internal}')
21+
) AS update_data (oldproc, newtypes)
22+
WHERE oid = pg_catalog.to_regprocedure(oldproc);
23+
24+
UPDATE pg_catalog.pg_proc SET
25+
prorettype = 'ghstore'::pg_catalog.regtype
26+
WHERE oid = pg_catalog.to_regprocedure('ghstore_union(internal,internal)');

contrib/hstore/hstore--1.3.sql renamed to contrib/hstore/hstore--1.4.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* contrib/hstore/hstore--1.3.sql */
1+
/* contrib/hstore/hstore--1.4.sql */
22

33
-- complain if script is sourced in psql, rather than via CREATE EXTENSION
44
\echo Use "CREATE EXTENSION hstore" to load this file. \quit

contrib/hstore/hstore.control

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# hstore extension
22
comment = 'data type for storing sets of (key, value) pairs'
3-
default_version = '1.3'
3+
default_version = '1.4'
44
module_pathname = '$libdir/hstore'
55
relocatable = true

contrib/intarray/Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ OBJS = _int_bool.o _int_gist.o _int_op.o _int_tool.o \
55
_intbig_gist.o _int_gin.o _int_selfuncs.o $(WIN32RES)
66

77
EXTENSION = intarray
8-
DATA = intarray--1.1.sql intarray--1.0--1.1.sql intarray--unpackaged--1.0.sql
8+
DATA = intarray--1.2.sql intarray--1.1--1.2.sql intarray--1.0--1.1.sql \
9+
intarray--unpackaged--1.0.sql
910
PGFILEDESC = "intarray - functions and operators for arrays of integers"
1011

1112
REGRESS = _int
+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
/* contrib/intarray/intarray--1.1--1.2.sql */
2+
3+
-- complain if script is sourced in psql, rather than via ALTER EXTENSION
4+
\echo Use "ALTER EXTENSION intarray UPDATE TO '1.2'" to load this file. \quit
5+
6+
-- Update procedure signatures the hard way.
7+
-- We use to_regprocedure() so that query doesn't fail if run against 9.6beta1 definitions,
8+
-- wherein the signatures have been updated already. In that case to_regprocedure() will
9+
-- return NULL and no updates will happen.
10+
11+
UPDATE pg_catalog.pg_proc SET
12+
proargtypes = pg_catalog.array_to_string(newtypes::pg_catalog.oid[], ' ')::pg_catalog.oidvector,
13+
pronargs = pg_catalog.array_length(newtypes, 1)
14+
FROM (VALUES
15+
(NULL::pg_catalog.text, NULL::pg_catalog.regtype[]), -- establish column types
16+
('g_int_consistent(internal,_int4,int4,oid,internal)', '{internal,_int4,int2,oid,internal}'),
17+
('g_intbig_consistent(internal,internal,int4,oid,internal)', '{internal,_int4,int2,oid,internal}'),
18+
('g_intbig_same(internal,internal,internal)', '{intbig_gkey,intbig_gkey,internal}'),
19+
('ginint4_queryextract(internal,internal,int2,internal,internal,internal,internal)', '{_int4,internal,int2,internal,internal,internal,internal}'),
20+
('ginint4_consistent(internal,int2,internal,int4,internal,internal,internal,internal)', '{internal,int2,_int4,int4,internal,internal,internal,internal}')
21+
) AS update_data (oldproc, newtypes)
22+
WHERE oid = pg_catalog.to_regprocedure(oldproc);
23+
24+
UPDATE pg_catalog.pg_proc SET
25+
prorettype = 'intbig_gkey'::pg_catalog.regtype
26+
WHERE oid = pg_catalog.to_regprocedure('g_intbig_union(internal,internal)');

contrib/intarray/intarray--1.1.sql renamed to contrib/intarray/intarray--1.2.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* contrib/intarray/intarray--1.1.sql */
1+
/* contrib/intarray/intarray--1.2.sql */
22

33
-- complain if script is sourced in psql, rather than via CREATE EXTENSION
44
\echo Use "CREATE EXTENSION intarray" to load this file. \quit

contrib/intarray/intarray.control

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# intarray extension
22
comment = 'functions, operators, and index support for 1-D arrays of integers'
3-
default_version = '1.1'
3+
default_version = '1.2'
44
module_pathname = '$libdir/_int'
55
relocatable = true

contrib/ltree/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ OBJS = ltree_io.o ltree_op.o lquery_op.o _ltree_op.o crc32.o \
66
PG_CPPFLAGS = -DLOWER_NODE
77

88
EXTENSION = ltree
9-
DATA = ltree--1.0.sql ltree--unpackaged--1.0.sql
9+
DATA = ltree--1.1.sql ltree--1.0--1.1.sql ltree--unpackaged--1.0.sql
1010
PGFILEDESC = "ltree - hierarchical label data type"
1111

1212
REGRESS = ltree

contrib/ltree/ltree--1.0--1.1.sql

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/* contrib/ltree/ltree--1.0--1.1.sql */
2+
3+
-- complain if script is sourced in psql, rather than via ALTER EXTENSION
4+
\echo Use "ALTER EXTENSION ltree UPDATE TO '1.1'" to load this file. \quit
5+
6+
-- Update procedure signatures the hard way.
7+
-- We use to_regprocedure() so that query doesn't fail if run against 9.6beta1 definitions,
8+
-- wherein the signatures have been updated already. In that case to_regprocedure() will
9+
-- return NULL and no updates will happen.
10+
11+
UPDATE pg_catalog.pg_proc SET
12+
proargtypes = pg_catalog.array_to_string(newtypes::pg_catalog.oid[], ' ')::pg_catalog.oidvector,
13+
pronargs = pg_catalog.array_length(newtypes, 1)
14+
FROM (VALUES
15+
(NULL::pg_catalog.text, NULL::pg_catalog.regtype[]), -- establish column types
16+
('ltree_consistent(internal,internal,int2,oid,internal)', '{internal,ltree,int2,oid,internal}'),
17+
('ltree_same(internal,internal,internal)', '{ltree_gist,ltree_gist,internal}'),
18+
('_ltree_consistent(internal,internal,int2,oid,internal)', '{internal,_ltree,int2,oid,internal}'),
19+
('_ltree_same(internal,internal,internal)', '{ltree_gist,ltree_gist,internal}')
20+
) AS update_data (oldproc, newtypes)
21+
WHERE oid = pg_catalog.to_regprocedure(oldproc);
22+
23+
UPDATE pg_catalog.pg_proc SET
24+
prorettype = 'ltree_gist'::pg_catalog.regtype
25+
WHERE oid = pg_catalog.to_regprocedure('ltree_union(internal,internal)');
26+
27+
UPDATE pg_catalog.pg_proc SET
28+
prorettype = 'ltree_gist'::pg_catalog.regtype
29+
WHERE oid = pg_catalog.to_regprocedure('_ltree_union(internal,internal)');

contrib/ltree/ltree--1.0.sql renamed to contrib/ltree/ltree--1.1.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* contrib/ltree/ltree--1.0.sql */
1+
/* contrib/ltree/ltree--1.1.sql */
22

33
-- complain if script is sourced in psql, rather than via CREATE EXTENSION
44
\echo Use "CREATE EXTENSION ltree" to load this file. \quit

contrib/ltree/ltree.control

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ltree extension
22
comment = 'data type for hierarchical tree-like structures'
3-
default_version = '1.0'
3+
default_version = '1.1'
44
module_pathname = '$libdir/ltree'
55
relocatable = true

contrib/pg_trgm/Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ MODULE_big = pg_trgm
44
OBJS = trgm_op.o trgm_gist.o trgm_gin.o trgm_regexp.o $(WIN32RES)
55

66
EXTENSION = pg_trgm
7-
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
7+
DATA = pg_trgm--1.3.sql pg_trgm--1.2--1.3.sql pg_trgm--1.1--1.2.sql \
8+
pg_trgm--1.0--1.1.sql pg_trgm--unpackaged--1.0.sql
89
PGFILEDESC = "pg_trgm - trigram matching"
910

1011
REGRESS = pg_trgm pg_word_trgm

contrib/pg_trgm/pg_trgm--1.2--1.3.sql

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
/* contrib/pg_trgm/pg_trgm--1.2--1.3.sql */
2+
3+
-- complain if script is sourced in psql, rather than via ALTER EXTENSION
4+
\echo Use "ALTER EXTENSION pg_trgm UPDATE TO '1.3'" to load this file. \quit
5+
6+
-- Update procedure signatures the hard way.
7+
-- We use to_regprocedure() so that query doesn't fail if run against 9.6beta1 definitions,
8+
-- wherein the signatures have been updated already. In that case to_regprocedure() will
9+
-- return NULL and no updates will happen.
10+
11+
UPDATE pg_catalog.pg_proc SET
12+
proargtypes = pg_catalog.array_to_string(newtypes::pg_catalog.oid[], ' ')::pg_catalog.oidvector,
13+
pronargs = pg_catalog.array_length(newtypes, 1)
14+
FROM (VALUES
15+
(NULL::pg_catalog.text, NULL::pg_catalog.regtype[]), -- establish column types
16+
('gtrgm_consistent(internal,text,int4,oid,internal)', '{internal,text,int2,oid,internal}'),
17+
('gtrgm_distance(internal,text,int4,oid)', '{internal,text,int2,oid,internal}'),
18+
('gtrgm_union(bytea,internal)', '{internal,internal}')
19+
) AS update_data (oldproc, newtypes)
20+
WHERE oid = pg_catalog.to_regprocedure(oldproc);
21+
22+
UPDATE pg_catalog.pg_proc SET
23+
prorettype = 'gtrgm'::pg_catalog.regtype
24+
WHERE oid = pg_catalog.to_regprocedure('gtrgm_union(internal,internal)');

contrib/pg_trgm/pg_trgm--1.2.sql renamed to contrib/pg_trgm/pg_trgm--1.3.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* contrib/pg_trgm/pg_trgm--1.2.sql */
1+
/* contrib/pg_trgm/pg_trgm--1.3.sql */
22

33
-- complain if script is sourced in psql, rather than via CREATE EXTENSION
44
\echo Use "CREATE EXTENSION pg_trgm" to load this file. \quit

contrib/pg_trgm/pg_trgm.control

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# pg_trgm extension
22
comment = 'text similarity measurement and index searching based on trigrams'
3-
default_version = '1.2'
3+
default_version = '1.3'
44
module_pathname = '$libdir/pg_trgm'
55
relocatable = true

contrib/seg/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ MODULE_big = seg
44
OBJS = seg.o segparse.o $(WIN32RES)
55

66
EXTENSION = seg
7-
DATA = seg--1.0.sql seg--unpackaged--1.0.sql
7+
DATA = seg--1.1.sql seg--1.0--1.1.sql seg--unpackaged--1.0.sql
88
PGFILEDESC = "seg - line segment data type"
99

1010
REGRESS = seg

contrib/seg/seg--1.0--1.1.sql

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
/* contrib/seg/seg--1.0--1.1.sql */
2+
3+
-- complain if script is sourced in psql, rather than via CREATE EXTENSION
4+
\echo Use "ALTER EXTENSION seg UPDATE TO '1.1'" to load this file. \quit
5+
6+
-- Update procedure signatures the hard way.
7+
-- We use to_regprocedure() so that query doesn't fail if run against 9.6beta1 definitions,
8+
-- wherein the signatures have been updated already. In that case to_regprocedure() will
9+
-- return NULL and no updates will happen.
10+
11+
UPDATE pg_catalog.pg_proc SET
12+
proargtypes = pg_catalog.array_to_string(newtypes::pg_catalog.oid[], ' ')::pg_catalog.oidvector,
13+
pronargs = pg_catalog.array_length(newtypes, 1)
14+
FROM (VALUES
15+
(NULL::pg_catalog.text, NULL::pg_catalog.regtype[]), -- establish column types
16+
('gseg_consistent(internal,seg,int4,oid,internal)', '{internal,seg,int2,oid,internal}')
17+
) AS update_data (oldproc, newtypes)
18+
WHERE oid = pg_catalog.to_regprocedure(oldproc);

contrib/seg/seg--1.0.sql renamed to contrib/seg/seg--1.1.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* contrib/seg/seg--1.0.sql */
1+
/* contrib/seg/seg--1.1.sql */
22

33
-- complain if script is sourced in psql, rather than via CREATE EXTENSION
44
\echo Use "CREATE EXTENSION seg" to load this file. \quit

contrib/seg/seg.control

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# seg extension
22
comment = 'data type for representing line segments or floating-point intervals'
3-
default_version = '1.0'
3+
default_version = '1.1'
44
module_pathname = '$libdir/seg'
55
relocatable = true

0 commit comments

Comments
 (0)