diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2009-04-05 00:40:35 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2009-04-05 00:40:35 +0000 |
| commit | 65e758a4d3d961f9fe936177405906a52574f70b (patch) | |
| tree | cf29edcf9619fae8bd08c6e511be04abf2534571 /contrib/intarray | |
| parent | eb3a10b05d101a6d237a76d724cf5cd8191d9e59 (diff) | |
| download | postgresql-65e758a4d3d961f9fe936177405906a52574f70b.tar.gz postgresql-65e758a4d3d961f9fe936177405906a52574f70b.zip | |
Remove contrib/intarray's definitions of the <@ and @> operators, so that they
don't cause confusion with the built-in anyarray versions of those operators.
Adjust the module's index opclasses to support the built-in operators in place
of the private ones.
The private implementations are still available under their historical
names @ and ~, so no functionality is lost. Some quick testing suggests
that they offer no real benefit over the core operators, however.
Per a complaint from Rusty Conover.
Diffstat (limited to 'contrib/intarray')
| -rw-r--r-- | contrib/intarray/_int.sql.in | 46 | ||||
| -rw-r--r-- | contrib/intarray/uninstall__int.sql | 6 |
2 files changed, 24 insertions, 28 deletions
diff --git a/contrib/intarray/_int.sql.in b/contrib/intarray/_int.sql.in index 9f91a65eec7..93930b559d5 100644 --- a/contrib/intarray/_int.sql.in +++ b/contrib/intarray/_int.sql.in @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/intarray/_int.sql.in,v 1.29 2009/03/25 22:19:01 tgl Exp $ */ +/* $PostgreSQL: pgsql/contrib/intarray/_int.sql.in,v 1.30 2009/04/05 00:40:35 tgl Exp $ */ -- Adjust this setting to control where the objects get created. SET search_path = public; @@ -152,23 +152,23 @@ CREATE OPERATOR && ( -- JOIN = neqjoinsel --); -CREATE OPERATOR @> ( - LEFTARG = _int4, - RIGHTARG = _int4, - PROCEDURE = _int_contains, - COMMUTATOR = '<@', - RESTRICT = contsel, - JOIN = contjoinsel -); +--CREATE OPERATOR @> ( +-- LEFTARG = _int4, +-- RIGHTARG = _int4, +-- PROCEDURE = _int_contains, +-- COMMUTATOR = '<@', +-- RESTRICT = contsel, +-- JOIN = contjoinsel +--); -CREATE OPERATOR <@ ( - LEFTARG = _int4, - RIGHTARG = _int4, - PROCEDURE = _int_contained, - COMMUTATOR = '@>', - RESTRICT = contsel, - JOIN = contjoinsel -); +--CREATE OPERATOR <@ ( +-- LEFTARG = _int4, +-- RIGHTARG = _int4, +-- PROCEDURE = _int_contained, +-- COMMUTATOR = '@>', +-- RESTRICT = contsel, +-- JOIN = contjoinsel +--); -- obsolete: CREATE OPERATOR @ ( @@ -365,8 +365,8 @@ CREATE OPERATOR CLASS gist__int_ops DEFAULT FOR TYPE _int4 USING gist AS OPERATOR 3 &&, OPERATOR 6 = (anyarray, anyarray), - OPERATOR 7 @>, - OPERATOR 8 <@, + OPERATOR 7 @> (anyarray, anyarray), + OPERATOR 8 <@ (anyarray, anyarray), OPERATOR 13 @, OPERATOR 14 ~, OPERATOR 20 @@ (_int4, query_int), @@ -442,8 +442,8 @@ FOR TYPE _int4 USING gist AS OPERATOR 3 &&, OPERATOR 6 = (anyarray, anyarray), - OPERATOR 7 @>, - OPERATOR 8 <@, + OPERATOR 7 @> (anyarray, anyarray), + OPERATOR 8 <@ (anyarray, anyarray), OPERATOR 13 @, OPERATOR 14 ~, OPERATOR 20 @@ (_int4, query_int), @@ -473,8 +473,8 @@ FOR TYPE _int4 USING gin AS OPERATOR 3 &&, OPERATOR 6 = (anyarray, anyarray), - OPERATOR 7 @>, - OPERATOR 8 <@, + OPERATOR 7 @> (anyarray, anyarray), + OPERATOR 8 <@ (anyarray, anyarray), OPERATOR 13 @, OPERATOR 14 ~, OPERATOR 20 @@ (_int4, query_int), diff --git a/contrib/intarray/uninstall__int.sql b/contrib/intarray/uninstall__int.sql index 5346bddc752..42721ed2fb0 100644 --- a/contrib/intarray/uninstall__int.sql +++ b/contrib/intarray/uninstall__int.sql @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/intarray/uninstall__int.sql,v 1.10 2009/03/25 22:19:01 tgl Exp $ */ +/* $PostgreSQL: pgsql/contrib/intarray/uninstall__int.sql,v 1.11 2009/04/05 00:40:35 tgl Exp $ */ -- Adjust this setting to control where the objects get created. SET search_path = public; @@ -91,10 +91,6 @@ DROP FUNCTION icount(_int4); DROP FUNCTION intset(int4); -DROP OPERATOR <@ (_int4, _int4); - -DROP OPERATOR @> (_int4, _int4); - DROP OPERATOR ~ (_int4, _int4); DROP OPERATOR @ (_int4, _int4); |