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

Commit 629b3af

Browse files
committed
Convert contrib modules to use the extension facility.
This isn't fully tested as yet, in particular I'm not sure that the "foo--unpackaged--1.0.sql" scripts are OK. But it's time to get some buildfarm cycles on it. sepgsql is not converted to an extension, mainly because it seems to require a very nonstandard installation process. Dimitri Fontaine and Tom Lane
1 parent e693e97 commit 629b3af

File tree

264 files changed

+2026
-2349
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

264 files changed

+2026
-2349
lines changed

contrib/adminpack/.gitignore

-1
This file was deleted.

contrib/adminpack/Makefile

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
# contrib/adminpack/Makefile
22

33
MODULE_big = adminpack
4-
PG_CPPFLAGS = -I$(libpq_srcdir)
5-
DATA_built = adminpack.sql
6-
DATA = uninstall_adminpack.sql
74
OBJS = adminpack.o
5+
PG_CPPFLAGS = -I$(libpq_srcdir)
6+
7+
EXTENSION = adminpack
8+
DATA = adminpack--1.0.sql adminpack--unpackaged--1.0.sql
89

910
ifdef USE_PGXS
1011
PG_CONFIG = pg_config

contrib/adminpack/adminpack.sql.in renamed to contrib/adminpack/adminpack--1.0.sql

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

33
/* ***********************************************
44
* Administrative functions for PostgreSQL
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
/* contrib/adminpack/adminpack--unpackaged--1.0.sql */
2+
3+
ALTER EXTENSION adminpack ADD function pg_catalog.pg_file_write(text,text,boolean);
4+
ALTER EXTENSION adminpack ADD function pg_catalog.pg_file_rename(text,text,text);
5+
ALTER EXTENSION adminpack ADD function pg_catalog.pg_file_rename(text,text);
6+
ALTER EXTENSION adminpack ADD function pg_catalog.pg_file_unlink(text);
7+
ALTER EXTENSION adminpack ADD function pg_catalog.pg_logdir_ls();
8+
ALTER EXTENSION adminpack ADD function pg_catalog.pg_file_read(text,bigint,bigint);
9+
ALTER EXTENSION adminpack ADD function pg_catalog.pg_file_length(text);
10+
ALTER EXTENSION adminpack ADD function pg_catalog.pg_logfile_rotate();

contrib/adminpack/adminpack.control

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# adminpack extension
2+
comment = 'administrative functions for PostgreSQL'
3+
default_version = '1.0'
4+
module_pathname = '$libdir/adminpack'
5+
relocatable = false
6+
schema = pg_catalog

contrib/adminpack/uninstall_adminpack.sql

-10
This file was deleted.

contrib/btree_gin/.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
/btree_gin.sql
21
# Generated subdirectories
32
/results/

contrib/btree_gin/Makefile

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
MODULE_big = btree_gin
44
OBJS = btree_gin.o
55

6-
DATA_built = btree_gin.sql
7-
DATA = uninstall_btree_gin.sql
6+
EXTENSION = btree_gin
7+
DATA = btree_gin--1.0.sql btree_gin--unpackaged--1.0.sql
8+
89
REGRESS = install_btree_gin int2 int4 int8 float4 float8 money oid \
910
timestamp timestamptz time timetz date interval \
1011
macaddr inet cidr text varchar char bytea bit varbit \

contrib/btree_gin/btree_gin.sql.in renamed to contrib/btree_gin/btree_gin--1.0.sql

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
/* contrib/btree_gin/btree_gin.sql.in */
2-
3-
-- Adjust this setting to control where the objects get created.
4-
SET search_path = public;
1+
/* contrib/btree_gin/btree_gin--1.0.sql */
52

63
CREATE OR REPLACE FUNCTION gin_btree_consistent(internal, int2, anyelement, int4, internal, internal)
74
RETURNS bool
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
/* contrib/btree_gin/btree_gin--unpackaged--1.0.sql */
2+
3+
ALTER EXTENSION btree_gin ADD function gin_btree_consistent(internal,smallint,anyelement,integer,internal,internal);
4+
ALTER EXTENSION btree_gin ADD function gin_extract_value_int2(smallint,internal);
5+
ALTER EXTENSION btree_gin ADD function gin_compare_prefix_int2(smallint,smallint,smallint,internal);
6+
ALTER EXTENSION btree_gin ADD function gin_extract_query_int2(smallint,internal,smallint,internal,internal);
7+
ALTER EXTENSION btree_gin ADD operator family int2_ops using gin;
8+
ALTER EXTENSION btree_gin ADD operator class int2_ops using gin;
9+
ALTER EXTENSION btree_gin ADD function gin_extract_value_int4(integer,internal);
10+
ALTER EXTENSION btree_gin ADD function gin_compare_prefix_int4(integer,integer,smallint,internal);
11+
ALTER EXTENSION btree_gin ADD function gin_extract_query_int4(integer,internal,smallint,internal,internal);
12+
ALTER EXTENSION btree_gin ADD operator family int4_ops using gin;
13+
ALTER EXTENSION btree_gin ADD operator class int4_ops using gin;
14+
ALTER EXTENSION btree_gin ADD function gin_extract_value_int8(bigint,internal);
15+
ALTER EXTENSION btree_gin ADD function gin_compare_prefix_int8(bigint,bigint,smallint,internal);
16+
ALTER EXTENSION btree_gin ADD function gin_extract_query_int8(bigint,internal,smallint,internal,internal);
17+
ALTER EXTENSION btree_gin ADD operator family int8_ops using gin;
18+
ALTER EXTENSION btree_gin ADD operator class int8_ops using gin;
19+
ALTER EXTENSION btree_gin ADD function gin_extract_value_float4(real,internal);
20+
ALTER EXTENSION btree_gin ADD function gin_compare_prefix_float4(real,real,smallint,internal);
21+
ALTER EXTENSION btree_gin ADD function gin_extract_query_float4(real,internal,smallint,internal,internal);
22+
ALTER EXTENSION btree_gin ADD operator family float4_ops using gin;
23+
ALTER EXTENSION btree_gin ADD operator class float4_ops using gin;
24+
ALTER EXTENSION btree_gin ADD function gin_extract_value_float8(double precision,internal);
25+
ALTER EXTENSION btree_gin ADD function gin_compare_prefix_float8(double precision,double precision,smallint,internal);
26+
ALTER EXTENSION btree_gin ADD function gin_extract_query_float8(double precision,internal,smallint,internal,internal);
27+
ALTER EXTENSION btree_gin ADD operator family float8_ops using gin;
28+
ALTER EXTENSION btree_gin ADD operator class float8_ops using gin;
29+
ALTER EXTENSION btree_gin ADD function gin_extract_value_money(money,internal);
30+
ALTER EXTENSION btree_gin ADD function gin_compare_prefix_money(money,money,smallint,internal);
31+
ALTER EXTENSION btree_gin ADD function gin_extract_query_money(money,internal,smallint,internal,internal);
32+
ALTER EXTENSION btree_gin ADD operator family money_ops using gin;
33+
ALTER EXTENSION btree_gin ADD operator class money_ops using gin;
34+
ALTER EXTENSION btree_gin ADD function gin_extract_value_oid(oid,internal);
35+
ALTER EXTENSION btree_gin ADD function gin_compare_prefix_oid(oid,oid,smallint,internal);
36+
ALTER EXTENSION btree_gin ADD function gin_extract_query_oid(oid,internal,smallint,internal,internal);
37+
ALTER EXTENSION btree_gin ADD operator family oid_ops using gin;
38+
ALTER EXTENSION btree_gin ADD operator class oid_ops using gin;
39+
ALTER EXTENSION btree_gin ADD function gin_extract_value_timestamp(timestamp without time zone,internal);
40+
ALTER EXTENSION btree_gin ADD function gin_compare_prefix_timestamp(timestamp without time zone,timestamp without time zone,smallint,internal);
41+
ALTER EXTENSION btree_gin ADD function gin_extract_query_timestamp(timestamp without time zone,internal,smallint,internal,internal);
42+
ALTER EXTENSION btree_gin ADD operator family timestamp_ops using gin;
43+
ALTER EXTENSION btree_gin ADD operator class timestamp_ops using gin;
44+
ALTER EXTENSION btree_gin ADD function gin_extract_value_timestamptz(timestamp with time zone,internal);
45+
ALTER EXTENSION btree_gin ADD function gin_compare_prefix_timestamptz(timestamp with time zone,timestamp with time zone,smallint,internal);
46+
ALTER EXTENSION btree_gin ADD function gin_extract_query_timestamptz(timestamp with time zone,internal,smallint,internal,internal);
47+
ALTER EXTENSION btree_gin ADD operator family timestamptz_ops using gin;
48+
ALTER EXTENSION btree_gin ADD operator class timestamptz_ops using gin;
49+
ALTER EXTENSION btree_gin ADD function gin_extract_value_time(time without time zone,internal);
50+
ALTER EXTENSION btree_gin ADD function gin_compare_prefix_time(time without time zone,time without time zone,smallint,internal);
51+
ALTER EXTENSION btree_gin ADD function gin_extract_query_time(time without time zone,internal,smallint,internal,internal);
52+
ALTER EXTENSION btree_gin ADD operator family time_ops using gin;
53+
ALTER EXTENSION btree_gin ADD operator class time_ops using gin;
54+
ALTER EXTENSION btree_gin ADD function gin_extract_value_timetz(time with time zone,internal);
55+
ALTER EXTENSION btree_gin ADD function gin_compare_prefix_timetz(time with time zone,time with time zone,smallint,internal);
56+
ALTER EXTENSION btree_gin ADD function gin_extract_query_timetz(time with time zone,internal,smallint,internal,internal);
57+
ALTER EXTENSION btree_gin ADD operator family timetz_ops using gin;
58+
ALTER EXTENSION btree_gin ADD operator class timetz_ops using gin;
59+
ALTER EXTENSION btree_gin ADD function gin_extract_value_date(date,internal);
60+
ALTER EXTENSION btree_gin ADD function gin_compare_prefix_date(date,date,smallint,internal);
61+
ALTER EXTENSION btree_gin ADD function gin_extract_query_date(date,internal,smallint,internal,internal);
62+
ALTER EXTENSION btree_gin ADD operator family date_ops using gin;
63+
ALTER EXTENSION btree_gin ADD operator class date_ops using gin;
64+
ALTER EXTENSION btree_gin ADD function gin_extract_value_interval(interval,internal);
65+
ALTER EXTENSION btree_gin ADD function gin_compare_prefix_interval(interval,interval,smallint,internal);
66+
ALTER EXTENSION btree_gin ADD function gin_extract_query_interval(interval,internal,smallint,internal,internal);
67+
ALTER EXTENSION btree_gin ADD operator family interval_ops using gin;
68+
ALTER EXTENSION btree_gin ADD operator class interval_ops using gin;
69+
ALTER EXTENSION btree_gin ADD function gin_extract_value_macaddr(macaddr,internal);
70+
ALTER EXTENSION btree_gin ADD function gin_compare_prefix_macaddr(macaddr,macaddr,smallint,internal);
71+
ALTER EXTENSION btree_gin ADD function gin_extract_query_macaddr(macaddr,internal,smallint,internal,internal);
72+
ALTER EXTENSION btree_gin ADD operator family macaddr_ops using gin;
73+
ALTER EXTENSION btree_gin ADD operator class macaddr_ops using gin;
74+
ALTER EXTENSION btree_gin ADD function gin_extract_value_inet(inet,internal);
75+
ALTER EXTENSION btree_gin ADD function gin_compare_prefix_inet(inet,inet,smallint,internal);
76+
ALTER EXTENSION btree_gin ADD function gin_extract_query_inet(inet,internal,smallint,internal,internal);
77+
ALTER EXTENSION btree_gin ADD operator family inet_ops using gin;
78+
ALTER EXTENSION btree_gin ADD operator class inet_ops using gin;
79+
ALTER EXTENSION btree_gin ADD function gin_extract_value_cidr(cidr,internal);
80+
ALTER EXTENSION btree_gin ADD function gin_compare_prefix_cidr(cidr,cidr,smallint,internal);
81+
ALTER EXTENSION btree_gin ADD function gin_extract_query_cidr(cidr,internal,smallint,internal,internal);
82+
ALTER EXTENSION btree_gin ADD operator family cidr_ops using gin;
83+
ALTER EXTENSION btree_gin ADD operator class cidr_ops using gin;
84+
ALTER EXTENSION btree_gin ADD function gin_extract_value_text(text,internal);
85+
ALTER EXTENSION btree_gin ADD function gin_compare_prefix_text(text,text,smallint,internal);
86+
ALTER EXTENSION btree_gin ADD function gin_extract_query_text(text,internal,smallint,internal,internal);
87+
ALTER EXTENSION btree_gin ADD operator family text_ops using gin;
88+
ALTER EXTENSION btree_gin ADD operator class text_ops using gin;
89+
ALTER EXTENSION btree_gin ADD operator family varchar_ops using gin;
90+
ALTER EXTENSION btree_gin ADD operator class varchar_ops using gin;
91+
ALTER EXTENSION btree_gin ADD function gin_extract_value_char("char",internal);
92+
ALTER EXTENSION btree_gin ADD function gin_compare_prefix_char("char","char",smallint,internal);
93+
ALTER EXTENSION btree_gin ADD function gin_extract_query_char("char",internal,smallint,internal,internal);
94+
ALTER EXTENSION btree_gin ADD operator family char_ops using gin;
95+
ALTER EXTENSION btree_gin ADD operator class char_ops using gin;
96+
ALTER EXTENSION btree_gin ADD function gin_extract_value_bytea(bytea,internal);
97+
ALTER EXTENSION btree_gin ADD function gin_compare_prefix_bytea(bytea,bytea,smallint,internal);
98+
ALTER EXTENSION btree_gin ADD function gin_extract_query_bytea(bytea,internal,smallint,internal,internal);
99+
ALTER EXTENSION btree_gin ADD operator family bytea_ops using gin;
100+
ALTER EXTENSION btree_gin ADD operator class bytea_ops using gin;
101+
ALTER EXTENSION btree_gin ADD function gin_extract_value_bit(bit,internal);
102+
ALTER EXTENSION btree_gin ADD function gin_compare_prefix_bit(bit,bit,smallint,internal);
103+
ALTER EXTENSION btree_gin ADD function gin_extract_query_bit(bit,internal,smallint,internal,internal);
104+
ALTER EXTENSION btree_gin ADD operator family bit_ops using gin;
105+
ALTER EXTENSION btree_gin ADD operator class bit_ops using gin;
106+
ALTER EXTENSION btree_gin ADD function gin_extract_value_varbit(bit varying,internal);
107+
ALTER EXTENSION btree_gin ADD function gin_compare_prefix_varbit(bit varying,bit varying,smallint,internal);
108+
ALTER EXTENSION btree_gin ADD function gin_extract_query_varbit(bit varying,internal,smallint,internal,internal);
109+
ALTER EXTENSION btree_gin ADD operator family varbit_ops using gin;
110+
ALTER EXTENSION btree_gin ADD operator class varbit_ops using gin;
111+
ALTER EXTENSION btree_gin ADD function gin_extract_value_numeric(numeric,internal);
112+
ALTER EXTENSION btree_gin ADD function gin_compare_prefix_numeric(numeric,numeric,smallint,internal);
113+
ALTER EXTENSION btree_gin ADD function gin_extract_query_numeric(numeric,internal,smallint,internal,internal);
114+
ALTER EXTENSION btree_gin ADD function gin_numeric_cmp(numeric,numeric);
115+
ALTER EXTENSION btree_gin ADD operator family numeric_ops using gin;
116+
ALTER EXTENSION btree_gin ADD operator class numeric_ops using gin;

contrib/btree_gin/btree_gin.control

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# btree_gin extension
2+
comment = 'support for indexing common datatypes in GIN'
3+
default_version = '1.0'
4+
module_pathname = '$libdir/btree_gin'
5+
relocatable = true
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
SET client_min_messages = warning;
2-
\set ECHO none
3-
RESET client_min_messages;
1+
CREATE EXTENSION btree_gin;
+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
SET client_min_messages = warning;
2-
\set ECHO none
3-
\i btree_gin.sql
4-
\set ECHO all
5-
RESET client_min_messages;
1+
CREATE EXTENSION btree_gin;

contrib/btree_gin/uninstall_btree_gin.sql

-98
This file was deleted.

contrib/btree_gist/.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
/btree_gist.sql
21
# Generated subdirectories
32
/results/

contrib/btree_gist/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ OBJS = btree_gist.o btree_utils_num.o btree_utils_var.o btree_int2.o btre
77
btree_date.o btree_interval.o btree_macaddr.o btree_inet.o btree_text.o \
88
btree_bytea.o btree_bit.o btree_numeric.o
99

10-
DATA_built = btree_gist.sql
11-
DATA = uninstall_btree_gist.sql
10+
EXTENSION = btree_gist
11+
DATA = btree_gist--1.0.sql btree_gist--unpackaged--1.0.sql
1212

1313
REGRESS = init int2 int4 int8 float4 float8 cash oid timestamp timestamptz time timetz \
1414
date interval macaddr inet cidr text varchar char bytea bit varbit numeric not_equal

contrib/btree_gist/btree_gist.sql.in renamed to contrib/btree_gist/btree_gist--1.0.sql

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
/* contrib/btree_gist/btree_gist.sql.in */
2-
3-
-- Adjust this setting to control where the objects get created.
4-
SET search_path = public;
1+
/* contrib/btree_gist/btree_gist--1.0.sql */
52

63
CREATE OR REPLACE FUNCTION gbtreekey4_in(cstring)
74
RETURNS gbtreekey4

0 commit comments

Comments
 (0)