summaryrefslogtreecommitdiff
path: root/contrib/cube/expected
diff options
context:
space:
mode:
authorTom Lane2006-09-10 17:36:52 +0000
committerTom Lane2006-09-10 17:36:52 +0000
commit684ad6a92fcc33adebdab65c4e7d72a68ba05408 (patch)
tree4cd0fc427b2100214e18452cc528e1b2e2d150fb /contrib/cube/expected
parentba920e1c9182eac55d5f1327ab0d29b721154277 (diff)
Rename contrib contains/contained-by operators to @> and <@, per discussion.
Diffstat (limited to 'contrib/cube/expected')
-rw-r--r--contrib/cube/expected/cube.out60
-rw-r--r--contrib/cube/expected/cube_1.out60
-rw-r--r--contrib/cube/expected/cube_2.out60
3 files changed, 90 insertions, 90 deletions
diff --git a/contrib/cube/expected/cube.out b/contrib/cube/expected/cube.out
index 59d5114861e..4f643573b51 100644
--- a/contrib/cube/expected/cube.out
+++ b/contrib/cube/expected/cube.out
@@ -627,91 +627,91 @@ SELECT '[(-1,-1,-1),(1,1,1)]'::cube && '[(2,1,1),(2,2,2)]'::cube AS bool;
-- "contained in" (the left operand is the cube entirely enclosed by
-- the right operand):
--
-SELECT '0'::cube ~ '0'::cube AS bool;
+SELECT '0'::cube <@ '0'::cube AS bool;
bool
------
t
(1 row)
-SELECT '0,0,0'::cube ~ '0,0,0'::cube AS bool;
+SELECT '0,0,0'::cube <@ '0,0,0'::cube AS bool;
bool
------
t
(1 row)
-SELECT '0,0'::cube ~ '0,0,1'::cube AS bool;
+SELECT '0,0'::cube <@ '0,0,1'::cube AS bool;
bool
------
t
(1 row)
-SELECT '0,0,0'::cube ~ '0,0,1'::cube AS bool;
+SELECT '0,0,0'::cube <@ '0,0,1'::cube AS bool;
bool
------
f
(1 row)
-SELECT '1,0,0'::cube ~ '0,0,1'::cube AS bool;
+SELECT '1,0,0'::cube <@ '0,0,1'::cube AS bool;
bool
------
f
(1 row)
-SELECT '(1,0,0),(0,0,1)'::cube ~ '(1,0,0),(0,0,1)'::cube AS bool;
+SELECT '(1,0,0),(0,0,1)'::cube <@ '(1,0,0),(0,0,1)'::cube AS bool;
bool
------
t
(1 row)
-SELECT '(1,0,0),(0,0,1)'::cube ~ '(-1,-1,-1),(1,1,1)'::cube AS bool;
+SELECT '(1,0,0),(0,0,1)'::cube <@ '(-1,-1,-1),(1,1,1)'::cube AS bool;
bool
------
t
(1 row)
-SELECT '(1,0,0),(0,0,1)'::cube ~ '(-1,-1,-1,-1),(1,1,1,1)'::cube AS bool;
+SELECT '(1,0,0),(0,0,1)'::cube <@ '(-1,-1,-1,-1),(1,1,1,1)'::cube AS bool;
bool
------
t
(1 row)
-SELECT '0'::cube ~ '(-1),(1)'::cube AS bool;
+SELECT '0'::cube <@ '(-1),(1)'::cube AS bool;
bool
------
t
(1 row)
-SELECT '1'::cube ~ '(-1),(1)'::cube AS bool;
+SELECT '1'::cube <@ '(-1),(1)'::cube AS bool;
bool
------
t
(1 row)
-SELECT '-1'::cube ~ '(-1),(1)'::cube AS bool;
+SELECT '-1'::cube <@ '(-1),(1)'::cube AS bool;
bool
------
t
(1 row)
-SELECT '(-1),(1)'::cube ~ '(-1),(1)'::cube AS bool;
+SELECT '(-1),(1)'::cube <@ '(-1),(1)'::cube AS bool;
bool
------
t
(1 row)
-SELECT '(-1),(1)'::cube ~ '(-1,-1),(1,1)'::cube AS bool;
+SELECT '(-1),(1)'::cube <@ '(-1,-1),(1,1)'::cube AS bool;
bool
------
t
(1 row)
-SELECT '(-2),(1)'::cube ~ '(-1),(1)'::cube AS bool;
+SELECT '(-2),(1)'::cube <@ '(-1),(1)'::cube AS bool;
bool
------
f
(1 row)
-SELECT '(-2),(1)'::cube ~ '(-1,-1),(1,1)'::cube AS bool;
+SELECT '(-2),(1)'::cube <@ '(-1,-1),(1,1)'::cube AS bool;
bool
------
f
@@ -720,91 +720,91 @@ SELECT '(-2),(1)'::cube ~ '(-1,-1),(1,1)'::cube AS bool;
-- "contains" (the left operand is the cube that entirely encloses the
-- right operand)
--
-SELECT '0'::cube @ '0'::cube AS bool;
+SELECT '0'::cube @> '0'::cube AS bool;
bool
------
t
(1 row)
-SELECT '0,0,0'::cube @ '0,0,0'::cube AS bool;
+SELECT '0,0,0'::cube @> '0,0,0'::cube AS bool;
bool
------
t
(1 row)
-SELECT '0,0,1'::cube @ '0,0'::cube AS bool;
+SELECT '0,0,1'::cube @> '0,0'::cube AS bool;
bool
------
t
(1 row)
-SELECT '0,0,1'::cube @ '0,0,0'::cube AS bool;
+SELECT '0,0,1'::cube @> '0,0,0'::cube AS bool;
bool
------
f
(1 row)
-SELECT '0,0,1'::cube @ '1,0,0'::cube AS bool;
+SELECT '0,0,1'::cube @> '1,0,0'::cube AS bool;
bool
------
f
(1 row)
-SELECT '(1,0,0),(0,0,1)'::cube @ '(1,0,0),(0,0,1)'::cube AS bool;
+SELECT '(1,0,0),(0,0,1)'::cube @> '(1,0,0),(0,0,1)'::cube AS bool;
bool
------
t
(1 row)
-SELECT '(-1,-1,-1),(1,1,1)'::cube @ '(1,0,0),(0,0,1)'::cube AS bool;
+SELECT '(-1,-1,-1),(1,1,1)'::cube @> '(1,0,0),(0,0,1)'::cube AS bool;
bool
------
t
(1 row)
-SELECT '(-1,-1,-1,-1),(1,1,1,1)'::cube @ '(1,0,0),(0,0,1)'::cube AS bool;
+SELECT '(-1,-1,-1,-1),(1,1,1,1)'::cube @> '(1,0,0),(0,0,1)'::cube AS bool;
bool
------
t
(1 row)
-SELECT '(-1),(1)'::cube @ '0'::cube AS bool;
+SELECT '(-1),(1)'::cube @> '0'::cube AS bool;
bool
------
t
(1 row)
-SELECT '(-1),(1)'::cube @ '1'::cube AS bool;
+SELECT '(-1),(1)'::cube @> '1'::cube AS bool;
bool
------
t
(1 row)
-SELECT '(-1),(1)'::cube @ '-1'::cube AS bool;
+SELECT '(-1),(1)'::cube @> '-1'::cube AS bool;
bool
------
t
(1 row)
-SELECT '(-1),(1)'::cube @ '(-1),(1)'::cube AS bool;
+SELECT '(-1),(1)'::cube @> '(-1),(1)'::cube AS bool;
bool
------
t
(1 row)
-SELECT '(-1,-1),(1,1)'::cube @ '(-1),(1)'::cube AS bool;
+SELECT '(-1,-1),(1,1)'::cube @> '(-1),(1)'::cube AS bool;
bool
------
t
(1 row)
-SELECT '(-1),(1)'::cube @ '(-2),(1)'::cube AS bool;
+SELECT '(-1),(1)'::cube @> '(-2),(1)'::cube AS bool;
bool
------
f
(1 row)
-SELECT '(-1,-1),(1,1)'::cube @ '(-2),(1)'::cube AS bool;
+SELECT '(-1,-1),(1,1)'::cube @> '(-2),(1)'::cube AS bool;
bool
------
f
diff --git a/contrib/cube/expected/cube_1.out b/contrib/cube/expected/cube_1.out
index a7a8d8d64f0..49e6c3fa31d 100644
--- a/contrib/cube/expected/cube_1.out
+++ b/contrib/cube/expected/cube_1.out
@@ -627,91 +627,91 @@ SELECT '[(-1,-1,-1),(1,1,1)]'::cube && '[(2,1,1),(2,2,2)]'::cube AS bool;
-- "contained in" (the left operand is the cube entirely enclosed by
-- the right operand):
--
-SELECT '0'::cube ~ '0'::cube AS bool;
+SELECT '0'::cube <@ '0'::cube AS bool;
bool
------
t
(1 row)
-SELECT '0,0,0'::cube ~ '0,0,0'::cube AS bool;
+SELECT '0,0,0'::cube <@ '0,0,0'::cube AS bool;
bool
------
t
(1 row)
-SELECT '0,0'::cube ~ '0,0,1'::cube AS bool;
+SELECT '0,0'::cube <@ '0,0,1'::cube AS bool;
bool
------
t
(1 row)
-SELECT '0,0,0'::cube ~ '0,0,1'::cube AS bool;
+SELECT '0,0,0'::cube <@ '0,0,1'::cube AS bool;
bool
------
f
(1 row)
-SELECT '1,0,0'::cube ~ '0,0,1'::cube AS bool;
+SELECT '1,0,0'::cube <@ '0,0,1'::cube AS bool;
bool
------
f
(1 row)
-SELECT '(1,0,0),(0,0,1)'::cube ~ '(1,0,0),(0,0,1)'::cube AS bool;
+SELECT '(1,0,0),(0,0,1)'::cube <@ '(1,0,0),(0,0,1)'::cube AS bool;
bool
------
t
(1 row)
-SELECT '(1,0,0),(0,0,1)'::cube ~ '(-1,-1,-1),(1,1,1)'::cube AS bool;
+SELECT '(1,0,0),(0,0,1)'::cube <@ '(-1,-1,-1),(1,1,1)'::cube AS bool;
bool
------
t
(1 row)
-SELECT '(1,0,0),(0,0,1)'::cube ~ '(-1,-1,-1,-1),(1,1,1,1)'::cube AS bool;
+SELECT '(1,0,0),(0,0,1)'::cube <@ '(-1,-1,-1,-1),(1,1,1,1)'::cube AS bool;
bool
------
t
(1 row)
-SELECT '0'::cube ~ '(-1),(1)'::cube AS bool;
+SELECT '0'::cube <@ '(-1),(1)'::cube AS bool;
bool
------
t
(1 row)
-SELECT '1'::cube ~ '(-1),(1)'::cube AS bool;
+SELECT '1'::cube <@ '(-1),(1)'::cube AS bool;
bool
------
t
(1 row)
-SELECT '-1'::cube ~ '(-1),(1)'::cube AS bool;
+SELECT '-1'::cube <@ '(-1),(1)'::cube AS bool;
bool
------
t
(1 row)
-SELECT '(-1),(1)'::cube ~ '(-1),(1)'::cube AS bool;
+SELECT '(-1),(1)'::cube <@ '(-1),(1)'::cube AS bool;
bool
------
t
(1 row)
-SELECT '(-1),(1)'::cube ~ '(-1,-1),(1,1)'::cube AS bool;
+SELECT '(-1),(1)'::cube <@ '(-1,-1),(1,1)'::cube AS bool;
bool
------
t
(1 row)
-SELECT '(-2),(1)'::cube ~ '(-1),(1)'::cube AS bool;
+SELECT '(-2),(1)'::cube <@ '(-1),(1)'::cube AS bool;
bool
------
f
(1 row)
-SELECT '(-2),(1)'::cube ~ '(-1,-1),(1,1)'::cube AS bool;
+SELECT '(-2),(1)'::cube <@ '(-1,-1),(1,1)'::cube AS bool;
bool
------
f
@@ -720,91 +720,91 @@ SELECT '(-2),(1)'::cube ~ '(-1,-1),(1,1)'::cube AS bool;
-- "contains" (the left operand is the cube that entirely encloses the
-- right operand)
--
-SELECT '0'::cube @ '0'::cube AS bool;
+SELECT '0'::cube @> '0'::cube AS bool;
bool
------
t
(1 row)
-SELECT '0,0,0'::cube @ '0,0,0'::cube AS bool;
+SELECT '0,0,0'::cube @> '0,0,0'::cube AS bool;
bool
------
t
(1 row)
-SELECT '0,0,1'::cube @ '0,0'::cube AS bool;
+SELECT '0,0,1'::cube @> '0,0'::cube AS bool;
bool
------
t
(1 row)
-SELECT '0,0,1'::cube @ '0,0,0'::cube AS bool;
+SELECT '0,0,1'::cube @> '0,0,0'::cube AS bool;
bool
------
f
(1 row)
-SELECT '0,0,1'::cube @ '1,0,0'::cube AS bool;
+SELECT '0,0,1'::cube @> '1,0,0'::cube AS bool;
bool
------
f
(1 row)
-SELECT '(1,0,0),(0,0,1)'::cube @ '(1,0,0),(0,0,1)'::cube AS bool;
+SELECT '(1,0,0),(0,0,1)'::cube @> '(1,0,0),(0,0,1)'::cube AS bool;
bool
------
t
(1 row)
-SELECT '(-1,-1,-1),(1,1,1)'::cube @ '(1,0,0),(0,0,1)'::cube AS bool;
+SELECT '(-1,-1,-1),(1,1,1)'::cube @> '(1,0,0),(0,0,1)'::cube AS bool;
bool
------
t
(1 row)
-SELECT '(-1,-1,-1,-1),(1,1,1,1)'::cube @ '(1,0,0),(0,0,1)'::cube AS bool;
+SELECT '(-1,-1,-1,-1),(1,1,1,1)'::cube @> '(1,0,0),(0,0,1)'::cube AS bool;
bool
------
t
(1 row)
-SELECT '(-1),(1)'::cube @ '0'::cube AS bool;
+SELECT '(-1),(1)'::cube @> '0'::cube AS bool;
bool
------
t
(1 row)
-SELECT '(-1),(1)'::cube @ '1'::cube AS bool;
+SELECT '(-1),(1)'::cube @> '1'::cube AS bool;
bool
------
t
(1 row)
-SELECT '(-1),(1)'::cube @ '-1'::cube AS bool;
+SELECT '(-1),(1)'::cube @> '-1'::cube AS bool;
bool
------
t
(1 row)
-SELECT '(-1),(1)'::cube @ '(-1),(1)'::cube AS bool;
+SELECT '(-1),(1)'::cube @> '(-1),(1)'::cube AS bool;
bool
------
t
(1 row)
-SELECT '(-1,-1),(1,1)'::cube @ '(-1),(1)'::cube AS bool;
+SELECT '(-1,-1),(1,1)'::cube @> '(-1),(1)'::cube AS bool;
bool
------
t
(1 row)
-SELECT '(-1),(1)'::cube @ '(-2),(1)'::cube AS bool;
+SELECT '(-1),(1)'::cube @> '(-2),(1)'::cube AS bool;
bool
------
f
(1 row)
-SELECT '(-1,-1),(1,1)'::cube @ '(-2),(1)'::cube AS bool;
+SELECT '(-1,-1),(1,1)'::cube @> '(-2),(1)'::cube AS bool;
bool
------
f
diff --git a/contrib/cube/expected/cube_2.out b/contrib/cube/expected/cube_2.out
index 0c1aba49729..ff6dbc4e5c7 100644
--- a/contrib/cube/expected/cube_2.out
+++ b/contrib/cube/expected/cube_2.out
@@ -627,91 +627,91 @@ SELECT '[(-1,-1,-1),(1,1,1)]'::cube && '[(2,1,1),(2,2,2)]'::cube AS bool;
-- "contained in" (the left operand is the cube entirely enclosed by
-- the right operand):
--
-SELECT '0'::cube ~ '0'::cube AS bool;
+SELECT '0'::cube <@ '0'::cube AS bool;
bool
------
t
(1 row)
-SELECT '0,0,0'::cube ~ '0,0,0'::cube AS bool;
+SELECT '0,0,0'::cube <@ '0,0,0'::cube AS bool;
bool
------
t
(1 row)
-SELECT '0,0'::cube ~ '0,0,1'::cube AS bool;
+SELECT '0,0'::cube <@ '0,0,1'::cube AS bool;
bool
------
t
(1 row)
-SELECT '0,0,0'::cube ~ '0,0,1'::cube AS bool;
+SELECT '0,0,0'::cube <@ '0,0,1'::cube AS bool;
bool
------
f
(1 row)
-SELECT '1,0,0'::cube ~ '0,0,1'::cube AS bool;
+SELECT '1,0,0'::cube <@ '0,0,1'::cube AS bool;
bool
------
f
(1 row)
-SELECT '(1,0,0),(0,0,1)'::cube ~ '(1,0,0),(0,0,1)'::cube AS bool;
+SELECT '(1,0,0),(0,0,1)'::cube <@ '(1,0,0),(0,0,1)'::cube AS bool;
bool
------
t
(1 row)
-SELECT '(1,0,0),(0,0,1)'::cube ~ '(-1,-1,-1),(1,1,1)'::cube AS bool;
+SELECT '(1,0,0),(0,0,1)'::cube <@ '(-1,-1,-1),(1,1,1)'::cube AS bool;
bool
------
t
(1 row)
-SELECT '(1,0,0),(0,0,1)'::cube ~ '(-1,-1,-1,-1),(1,1,1,1)'::cube AS bool;
+SELECT '(1,0,0),(0,0,1)'::cube <@ '(-1,-1,-1,-1),(1,1,1,1)'::cube AS bool;
bool
------
t
(1 row)
-SELECT '0'::cube ~ '(-1),(1)'::cube AS bool;
+SELECT '0'::cube <@ '(-1),(1)'::cube AS bool;
bool
------
t
(1 row)
-SELECT '1'::cube ~ '(-1),(1)'::cube AS bool;
+SELECT '1'::cube <@ '(-1),(1)'::cube AS bool;
bool
------
t
(1 row)
-SELECT '-1'::cube ~ '(-1),(1)'::cube AS bool;
+SELECT '-1'::cube <@ '(-1),(1)'::cube AS bool;
bool
------
t
(1 row)
-SELECT '(-1),(1)'::cube ~ '(-1),(1)'::cube AS bool;
+SELECT '(-1),(1)'::cube <@ '(-1),(1)'::cube AS bool;
bool
------
t
(1 row)
-SELECT '(-1),(1)'::cube ~ '(-1,-1),(1,1)'::cube AS bool;
+SELECT '(-1),(1)'::cube <@ '(-1,-1),(1,1)'::cube AS bool;
bool
------
t
(1 row)
-SELECT '(-2),(1)'::cube ~ '(-1),(1)'::cube AS bool;
+SELECT '(-2),(1)'::cube <@ '(-1),(1)'::cube AS bool;
bool
------
f
(1 row)
-SELECT '(-2),(1)'::cube ~ '(-1,-1),(1,1)'::cube AS bool;
+SELECT '(-2),(1)'::cube <@ '(-1,-1),(1,1)'::cube AS bool;
bool
------
f
@@ -720,91 +720,91 @@ SELECT '(-2),(1)'::cube ~ '(-1,-1),(1,1)'::cube AS bool;
-- "contains" (the left operand is the cube that entirely encloses the
-- right operand)
--
-SELECT '0'::cube @ '0'::cube AS bool;
+SELECT '0'::cube @> '0'::cube AS bool;
bool
------
t
(1 row)
-SELECT '0,0,0'::cube @ '0,0,0'::cube AS bool;
+SELECT '0,0,0'::cube @> '0,0,0'::cube AS bool;
bool
------
t
(1 row)
-SELECT '0,0,1'::cube @ '0,0'::cube AS bool;
+SELECT '0,0,1'::cube @> '0,0'::cube AS bool;
bool
------
t
(1 row)
-SELECT '0,0,1'::cube @ '0,0,0'::cube AS bool;
+SELECT '0,0,1'::cube @> '0,0,0'::cube AS bool;
bool
------
f
(1 row)
-SELECT '0,0,1'::cube @ '1,0,0'::cube AS bool;
+SELECT '0,0,1'::cube @> '1,0,0'::cube AS bool;
bool
------
f
(1 row)
-SELECT '(1,0,0),(0,0,1)'::cube @ '(1,0,0),(0,0,1)'::cube AS bool;
+SELECT '(1,0,0),(0,0,1)'::cube @> '(1,0,0),(0,0,1)'::cube AS bool;
bool
------
t
(1 row)
-SELECT '(-1,-1,-1),(1,1,1)'::cube @ '(1,0,0),(0,0,1)'::cube AS bool;
+SELECT '(-1,-1,-1),(1,1,1)'::cube @> '(1,0,0),(0,0,1)'::cube AS bool;
bool
------
t
(1 row)
-SELECT '(-1,-1,-1,-1),(1,1,1,1)'::cube @ '(1,0,0),(0,0,1)'::cube AS bool;
+SELECT '(-1,-1,-1,-1),(1,1,1,1)'::cube @> '(1,0,0),(0,0,1)'::cube AS bool;
bool
------
t
(1 row)
-SELECT '(-1),(1)'::cube @ '0'::cube AS bool;
+SELECT '(-1),(1)'::cube @> '0'::cube AS bool;
bool
------
t
(1 row)
-SELECT '(-1),(1)'::cube @ '1'::cube AS bool;
+SELECT '(-1),(1)'::cube @> '1'::cube AS bool;
bool
------
t
(1 row)
-SELECT '(-1),(1)'::cube @ '-1'::cube AS bool;
+SELECT '(-1),(1)'::cube @> '-1'::cube AS bool;
bool
------
t
(1 row)
-SELECT '(-1),(1)'::cube @ '(-1),(1)'::cube AS bool;
+SELECT '(-1),(1)'::cube @> '(-1),(1)'::cube AS bool;
bool
------
t
(1 row)
-SELECT '(-1,-1),(1,1)'::cube @ '(-1),(1)'::cube AS bool;
+SELECT '(-1,-1),(1,1)'::cube @> '(-1),(1)'::cube AS bool;
bool
------
t
(1 row)
-SELECT '(-1),(1)'::cube @ '(-2),(1)'::cube AS bool;
+SELECT '(-1),(1)'::cube @> '(-2),(1)'::cube AS bool;
bool
------
f
(1 row)
-SELECT '(-1,-1),(1,1)'::cube @ '(-2),(1)'::cube AS bool;
+SELECT '(-1,-1),(1,1)'::cube @> '(-2),(1)'::cube AS bool;
bool
------
f