mirror of
https://github.com/postgres/postgres.git
synced 2025-07-28 23:42:10 +03:00
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.
This commit is contained 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),
|
||||
|
@ -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);
|
||||
|
Reference in New Issue
Block a user