Rename contrib contains/contained-by operators to @> and <@, per discussion.

1 files changed, 19 insertions, 20 deletions

diff --git a/contrib/seg/expected/seg_1.out b/contrib/seg/expected/seg_1.out
index 2c446b7cc6e..446714f8ba0 100644
--- a/contrib/seg/expected/seg_1.out
+++ b/contrib/seg/expected/seg_1.out
@@ -5,10 +5,9 @@
 -- first, define the datatype.  Turn off echoing so that expected file
 -- does not depend on contents of seg.sql.
 --
+SET client_min_messages = warning;
 \set ECHO none
-psql:seg.sql:10: NOTICE:  type "seg" is not yet defined
-DETAIL:  Creating a shell type definition.
-psql:seg.sql:15: NOTICE:  argument type seg is only a shell
+RESET client_min_messages;
 --
 -- testing the input and output functions
 --
@@ -814,49 +813,49 @@ SELECT '2 .. 3'::seg >> '0 .. 1'::seg AS bool;
 
 -- "contained in" (the left value belongs within the interval specified in the right value):
 --
-SELECT '0'::seg        ~ '0'::seg AS bool;
+SELECT '0'::seg        <@ '0'::seg AS bool;
  bool 
 ------
  t
 (1 row)
 
-SELECT '0'::seg        ~ '0 ..'::seg AS bool;
+SELECT '0'::seg        <@ '0 ..'::seg AS bool;
  bool 
 ------
  t
 (1 row)
 
-SELECT '0'::seg        ~ '.. 0'::seg AS bool;
+SELECT '0'::seg        <@ '.. 0'::seg AS bool;
  bool 
 ------
  t
 (1 row)
 
-SELECT '0'::seg        ~ '-1 .. 1'::seg AS bool;
+SELECT '0'::seg        <@ '-1 .. 1'::seg AS bool;
  bool 
 ------
  t
 (1 row)
 
-SELECT '0'::seg        ~ '-1 .. 1'::seg AS bool;
+SELECT '0'::seg        <@ '-1 .. 1'::seg AS bool;
  bool 
 ------
  t
 (1 row)
 
-SELECT '-1'::seg       ~ '-1 .. 1'::seg AS bool;
+SELECT '-1'::seg       <@ '-1 .. 1'::seg AS bool;
  bool 
 ------
  t
 (1 row)
 
-SELECT '1'::seg        ~ '-1 .. 1'::seg AS bool;
+SELECT '1'::seg        <@ '-1 .. 1'::seg AS bool;
  bool 
 ------
  t
 (1 row)
 
-SELECT '-1 .. 1'::seg  ~ '-1 .. 1'::seg AS bool;
+SELECT '-1 .. 1'::seg  <@ '-1 .. 1'::seg AS bool;
  bool 
 ------
  t
@@ -864,43 +863,43 @@ SELECT '-1 .. 1'::seg  ~ '-1 .. 1'::seg AS bool;
 
 -- "contains" (the left value contains the interval specified in the right value):
 --
-SELECT '0'::seg @ '0'::seg AS bool;
+SELECT '0'::seg @> '0'::seg AS bool;
  bool 
 ------
  t
 (1 row)
 
-SELECT '0 .. '::seg ~ '0'::seg AS bool;
+SELECT '0 .. '::seg <@ '0'::seg AS bool;
  bool 
 ------
  f
 (1 row)
 
-SELECT '.. 0'::seg ~ '0'::seg AS bool;
+SELECT '.. 0'::seg <@ '0'::seg AS bool;
  bool 
 ------
  f
 (1 row)
 
-SELECT '-1 .. 1'::seg ~ '0'::seg AS bool;
+SELECT '-1 .. 1'::seg <@ '0'::seg AS bool;
  bool 
 ------
  f
 (1 row)
 
-SELECT '0'::seg ~ '-1 .. 1'::seg AS bool;
+SELECT '0'::seg <@ '-1 .. 1'::seg AS bool;
  bool 
 ------
  t
 (1 row)
 
-SELECT '-1'::seg ~ '-1 .. 1'::seg AS bool;
+SELECT '-1'::seg <@ '-1 .. 1'::seg AS bool;
  bool 
 ------
  t
 (1 row)
 
-SELECT '1'::seg ~ '-1 .. 1'::seg AS bool;
+SELECT '1'::seg <@ '-1 .. 1'::seg AS bool;
  bool 
 ------
  t
@@ -911,14 +910,14 @@ SELECT '1'::seg ~ '-1 .. 1'::seg AS bool;
 CREATE TABLE test_seg (s seg);
 \copy test_seg from 'data/test_seg.data'
 CREATE INDEX test_seg_ix ON test_seg USING gist (s);
-SELECT count(*) FROM test_seg WHERE s @ '11..11.3';
+SELECT count(*) FROM test_seg WHERE s @> '11..11.3';
  count 
 -------
    143
 (1 row)
 
 -- Test sorting 
-SELECT * FROM test_seg WHERE s @ '11..11.3' GROUP BY s;
+SELECT * FROM test_seg WHERE s @> '11..11.3' GROUP BY s;
         s        
 -----------------
  .. 4.0e1