diff options
Diffstat (limited to 'contrib/intarray')
| -rw-r--r-- | contrib/intarray/.gitignore | 1 | ||||
| -rw-r--r-- | contrib/intarray/Makefile | 6 | ||||
| -rw-r--r-- | contrib/intarray/expected/_int.out | 8 | ||||
| -rw-r--r-- | contrib/intarray/intarray--1.0.sql (renamed from contrib/intarray/_int.sql.in) | 5 | ||||
| -rw-r--r-- | contrib/intarray/intarray--unpackaged--1.0.sql | 71 | ||||
| -rw-r--r-- | contrib/intarray/intarray.control | 5 | ||||
| -rw-r--r-- | contrib/intarray/sql/_int.sql | 10 | ||||
| -rw-r--r-- | contrib/intarray/uninstall__int.sql | 128 |
8 files changed, 83 insertions, 151 deletions
diff --git a/contrib/intarray/.gitignore b/contrib/intarray/.gitignore index 761a9b26074..19b6c5ba425 100644 --- a/contrib/intarray/.gitignore +++ b/contrib/intarray/.gitignore @@ -1,3 +1,2 @@ -/_int.sql # Generated subdirectories /results/ diff --git a/contrib/intarray/Makefile b/contrib/intarray/Makefile index a10d7c6b1f9..71f820ec4a8 100644 --- a/contrib/intarray/Makefile +++ b/contrib/intarray/Makefile @@ -2,8 +2,10 @@ MODULE_big = _int OBJS = _int_bool.o _int_gist.o _int_op.o _int_tool.o _intbig_gist.o _int_gin.o -DATA_built = _int.sql -DATA = uninstall__int.sql + +EXTENSION = intarray +DATA = intarray--1.0.sql intarray--unpackaged--1.0.sql + REGRESS = _int ifdef USE_PGXS diff --git a/contrib/intarray/expected/_int.out b/contrib/intarray/expected/_int.out index 596439d3149..6ed3cc6ced0 100644 --- a/contrib/intarray/expected/_int.out +++ b/contrib/intarray/expected/_int.out @@ -1,10 +1,4 @@ --- --- first, define the datatype. Turn off echoing so that expected file --- does not depend on contents of _int.sql. --- -SET client_min_messages = warning; -\set ECHO none -RESET client_min_messages; +CREATE EXTENSION intarray; SELECT intset(1234); intset -------- diff --git a/contrib/intarray/_int.sql.in b/contrib/intarray/intarray--1.0.sql index ad224e319bc..5f86ee607f1 100644 --- a/contrib/intarray/_int.sql.in +++ b/contrib/intarray/intarray--1.0.sql @@ -1,7 +1,4 @@ -/* contrib/intarray/_int.sql.in */ - --- Adjust this setting to control where the objects get created. -SET search_path = public; +/* contrib/intarray/intarray--1.0.sql */ -- -- Create the user-defined type for the 1-D integer arrays (_int4) diff --git a/contrib/intarray/intarray--unpackaged--1.0.sql b/contrib/intarray/intarray--unpackaged--1.0.sql new file mode 100644 index 00000000000..7fd739b0ed4 --- /dev/null +++ b/contrib/intarray/intarray--unpackaged--1.0.sql @@ -0,0 +1,71 @@ +/* contrib/intarray/intarray--unpackaged--1.0.sql */ + +ALTER EXTENSION intarray ADD type query_int; +ALTER EXTENSION intarray ADD function bqarr_in(cstring); +ALTER EXTENSION intarray ADD function bqarr_out(query_int); +ALTER EXTENSION intarray ADD function querytree(query_int); +ALTER EXTENSION intarray ADD function boolop(integer[],query_int); +ALTER EXTENSION intarray ADD function rboolop(query_int,integer[]); +ALTER EXTENSION intarray ADD operator ~~(query_int,integer[]); +ALTER EXTENSION intarray ADD operator @@(integer[],query_int); +ALTER EXTENSION intarray ADD function _int_contains(integer[],integer[]); +ALTER EXTENSION intarray ADD function _int_contained(integer[],integer[]); +ALTER EXTENSION intarray ADD function _int_overlap(integer[],integer[]); +ALTER EXTENSION intarray ADD function _int_same(integer[],integer[]); +ALTER EXTENSION intarray ADD function _int_different(integer[],integer[]); +ALTER EXTENSION intarray ADD function _int_union(integer[],integer[]); +ALTER EXTENSION intarray ADD function _int_inter(integer[],integer[]); +ALTER EXTENSION intarray ADD operator &&(integer[],integer[]); +ALTER EXTENSION intarray ADD operator <@(integer[],integer[]); +ALTER EXTENSION intarray ADD operator @>(integer[],integer[]); +ALTER EXTENSION intarray ADD operator ~(integer[],integer[]); +ALTER EXTENSION intarray ADD operator @(integer[],integer[]); +ALTER EXTENSION intarray ADD function intset(integer); +ALTER EXTENSION intarray ADD function icount(integer[]); +ALTER EXTENSION intarray ADD operator #(NONE,integer[]); +ALTER EXTENSION intarray ADD function sort(integer[],text); +ALTER EXTENSION intarray ADD function sort(integer[]); +ALTER EXTENSION intarray ADD function sort_asc(integer[]); +ALTER EXTENSION intarray ADD function sort_desc(integer[]); +ALTER EXTENSION intarray ADD function uniq(integer[]); +ALTER EXTENSION intarray ADD function idx(integer[],integer); +ALTER EXTENSION intarray ADD operator #(integer[],integer); +ALTER EXTENSION intarray ADD function subarray(integer[],integer,integer); +ALTER EXTENSION intarray ADD function subarray(integer[],integer); +ALTER EXTENSION intarray ADD function intarray_push_elem(integer[],integer); +ALTER EXTENSION intarray ADD operator +(integer[],integer); +ALTER EXTENSION intarray ADD function intarray_push_array(integer[],integer[]); +ALTER EXTENSION intarray ADD operator +(integer[],integer[]); +ALTER EXTENSION intarray ADD function intarray_del_elem(integer[],integer); +ALTER EXTENSION intarray ADD operator -(integer[],integer); +ALTER EXTENSION intarray ADD function intset_union_elem(integer[],integer); +ALTER EXTENSION intarray ADD operator |(integer[],integer); +ALTER EXTENSION intarray ADD operator |(integer[],integer[]); +ALTER EXTENSION intarray ADD function intset_subtract(integer[],integer[]); +ALTER EXTENSION intarray ADD operator -(integer[],integer[]); +ALTER EXTENSION intarray ADD operator &(integer[],integer[]); +ALTER EXTENSION intarray ADD function g_int_consistent(internal,integer[],integer,oid,internal); +ALTER EXTENSION intarray ADD function g_int_compress(internal); +ALTER EXTENSION intarray ADD function g_int_decompress(internal); +ALTER EXTENSION intarray ADD function g_int_penalty(internal,internal,internal); +ALTER EXTENSION intarray ADD function g_int_picksplit(internal,internal); +ALTER EXTENSION intarray ADD function g_int_union(internal,internal); +ALTER EXTENSION intarray ADD function g_int_same(integer[],integer[],internal); +ALTER EXTENSION intarray ADD operator family gist__int_ops using gist; +ALTER EXTENSION intarray ADD operator class gist__int_ops using gist; +ALTER EXTENSION intarray ADD type intbig_gkey; +ALTER EXTENSION intarray ADD function _intbig_in(cstring); +ALTER EXTENSION intarray ADD function _intbig_out(intbig_gkey); +ALTER EXTENSION intarray ADD function g_intbig_consistent(internal,internal,integer,oid,internal); +ALTER EXTENSION intarray ADD function g_intbig_compress(internal); +ALTER EXTENSION intarray ADD function g_intbig_decompress(internal); +ALTER EXTENSION intarray ADD function g_intbig_penalty(internal,internal,internal); +ALTER EXTENSION intarray ADD function g_intbig_picksplit(internal,internal); +ALTER EXTENSION intarray ADD function g_intbig_union(internal,internal); +ALTER EXTENSION intarray ADD function g_intbig_same(internal,internal,internal); +ALTER EXTENSION intarray ADD operator family gist__intbig_ops using gist; +ALTER EXTENSION intarray ADD operator class gist__intbig_ops using gist; +ALTER EXTENSION intarray ADD function ginint4_queryextract(internal,internal,smallint,internal,internal,internal,internal); +ALTER EXTENSION intarray ADD function ginint4_consistent(internal,smallint,internal,integer,internal,internal,internal,internal); +ALTER EXTENSION intarray ADD operator family gin__int_ops using gin; +ALTER EXTENSION intarray ADD operator class gin__int_ops using gin; diff --git a/contrib/intarray/intarray.control b/contrib/intarray/intarray.control new file mode 100644 index 00000000000..7b3d4f78f05 --- /dev/null +++ b/contrib/intarray/intarray.control @@ -0,0 +1,5 @@ +# intarray extension +comment = 'functions, operators, and index support for 1-D arrays of integers' +default_version = '1.0' +module_pathname = '$libdir/_int' +relocatable = true diff --git a/contrib/intarray/sql/_int.sql b/contrib/intarray/sql/_int.sql index 1588e3b5145..b60e936dc52 100644 --- a/contrib/intarray/sql/_int.sql +++ b/contrib/intarray/sql/_int.sql @@ -1,12 +1,4 @@ --- --- first, define the datatype. Turn off echoing so that expected file --- does not depend on contents of _int.sql. --- -SET client_min_messages = warning; -\set ECHO none -\i _int.sql -\set ECHO all -RESET client_min_messages; +CREATE EXTENSION intarray; SELECT intset(1234); SELECT icount('{1234234,234234}'); diff --git a/contrib/intarray/uninstall__int.sql b/contrib/intarray/uninstall__int.sql deleted file mode 100644 index 345ad4464bd..00000000000 --- a/contrib/intarray/uninstall__int.sql +++ /dev/null @@ -1,128 +0,0 @@ -/* contrib/intarray/uninstall__int.sql */ - --- Adjust this setting to control where the objects get created. -SET search_path = public; - -DROP OPERATOR CLASS gin__int_ops USING gin; - -DROP FUNCTION ginint4_queryextract(internal, internal, int2, internal, internal, internal, internal); - -DROP FUNCTION ginint4_consistent(internal, int2, internal, int4, internal, internal, internal, internal); - -DROP OPERATOR CLASS gist__intbig_ops USING gist; - -DROP FUNCTION g_intbig_same(internal, internal, internal); - -DROP FUNCTION g_intbig_union(internal, internal); - -DROP FUNCTION g_intbig_picksplit(internal, internal); - -DROP FUNCTION g_intbig_penalty(internal,internal,internal); - -DROP FUNCTION g_intbig_decompress(internal); - -DROP FUNCTION g_intbig_compress(internal); - -DROP FUNCTION g_intbig_consistent(internal,internal,int,oid,internal); - -DROP TYPE intbig_gkey CASCADE; - -DROP OPERATOR CLASS gist__int_ops USING gist; - -DROP FUNCTION g_int_same(_int4, _int4, internal); - -DROP FUNCTION g_int_union(internal, internal); - -DROP FUNCTION g_int_picksplit(internal, internal); - -DROP FUNCTION g_int_penalty(internal,internal,internal); - -DROP FUNCTION g_int_decompress(internal); - -DROP FUNCTION g_int_compress(internal); - -DROP FUNCTION g_int_consistent(internal,_int4,int,oid,internal); - -DROP OPERATOR & (_int4, _int4); - -DROP OPERATOR - (_int4, _int4); - -DROP FUNCTION intset_subtract(_int4, _int4); - -DROP OPERATOR | (_int4, _int4); - -DROP OPERATOR | (_int4, int4); - -DROP FUNCTION intset_union_elem(_int4, int4); - -DROP OPERATOR - (_int4, int4); - -DROP FUNCTION intarray_del_elem(_int4, int4); - -DROP OPERATOR + (_int4, _int4); - -DROP FUNCTION intarray_push_array(_int4, _int4); - -DROP OPERATOR + (_int4, int4); - -DROP FUNCTION intarray_push_elem(_int4, int4); - -DROP FUNCTION subarray(_int4, int4); - -DROP FUNCTION subarray(_int4, int4, int4); - -DROP OPERATOR # (_int4, int4); - -DROP FUNCTION idx(_int4, int4); - -DROP FUNCTION uniq(_int4); - -DROP FUNCTION sort_desc(_int4); - -DROP FUNCTION sort_asc(_int4); - -DROP FUNCTION sort(_int4); - -DROP FUNCTION sort(_int4, text); - -DROP OPERATOR # (NONE, _int4); - -DROP FUNCTION icount(_int4); - -DROP FUNCTION intset(int4); - -DROP OPERATOR <@ (_int4, _int4); - -DROP OPERATOR @> (_int4, _int4); - -DROP OPERATOR ~ (_int4, _int4); - -DROP OPERATOR @ (_int4, _int4); - -DROP OPERATOR && (_int4, _int4); - -DROP FUNCTION _int_inter(_int4, _int4); - -DROP FUNCTION _int_union(_int4, _int4); - -DROP FUNCTION _int_different(_int4, _int4); - -DROP FUNCTION _int_same(_int4, _int4); - -DROP FUNCTION _int_overlap(_int4, _int4); - -DROP FUNCTION _int_contained(_int4, _int4); - -DROP FUNCTION _int_contains(_int4, _int4); - -DROP OPERATOR ~~ (query_int, _int4); - -DROP OPERATOR @@ (_int4, query_int); - -DROP FUNCTION rboolop(query_int, _int4); - -DROP FUNCTION boolop(_int4, query_int); - -DROP FUNCTION querytree(query_int); - -DROP TYPE query_int CASCADE; |