aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2014-10-11 17:14:16 -0400
committerBruce Momjian <bruce@momjian.us>2014-10-11 17:14:16 -0400
commit4f2e5a8a84f39ec027d1018f655b85b1b1513701 (patch)
tree00eeb9e7da587dae0382e1a30fac795cfa2dc69a
parent25ad5a52847699527ddba6e86aa353075e578e9b (diff)
downloadpostgresql-4f2e5a8a84f39ec027d1018f655b85b1b1513701.tar.gz
postgresql-4f2e5a8a84f39ec027d1018f655b85b1b1513701.zip
regression: adjust polygon diagrams to not use tabs
Also, small diagram adjustments Patch by Emre Hasegeli
-rw-r--r--src/test/regress/expected/polygon.out35
-rw-r--r--src/test/regress/sql/polygon.sql35
2 files changed, 36 insertions, 34 deletions
diff --git a/src/test/regress/expected/polygon.out b/src/test/regress/expected/polygon.out
index b2529027201..33388eb9093 100644
--- a/src/test/regress/expected/polygon.out
+++ b/src/test/regress/expected/polygon.out
@@ -3,15 +3,15 @@
--
-- polygon logic
--
--- 3 o
--- |
--- 2 + |
--- / |
--- 1 # o +
--- / |
--- 0 #-----o-+
+-- 3 o
+-- |
+-- 2 + |
+-- / |
+-- 1 # +
+-- / o |
+-- 0 #-----o-+
--
--- 0 1 2 3 4
+-- 0 1 2 3 4
--
CREATE TABLE POLYGON_TBL(f1 polygon);
INSERT INTO POLYGON_TBL(f1) VALUES ('(2.0,0.0),(2.0,4.0),(0.0,0.0)');
@@ -128,15 +128,16 @@ SELECT '' AS one, p.*
--
-- polygon logic
--
--- 3 o
--- |
--- 2 + |
--- / |
--- 1 / o +
+-- 3 o
+-- /|
+-- 2 + |
+-- / |
+-- 1 / o +
-- / |
--- 0 +-----o-+
+-- 0 +-----o-+
+--
+-- 0 1 2 3 4
--
--- 0 1 2 3 4
--
-- left of
SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' << polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS false;
@@ -248,11 +249,11 @@ SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' && polygon '(3.0,1.0),(3.0,3.0),(
(1 row)
-- +--------------------+
--- | *---* 1
+-- | *---* 1
-- | + | |
-- | 2 *---*
-- +--------------------+
--- 3
+-- 3
-- Edges 1-2, 2-3 are not shown on picture
SELECT '((0,4),(6,4),(1,2),(6,0),(0,0))'::polygon && '((2,1),(2,3),(3,3),(3,1))'::polygon AS "true";
true
diff --git a/src/test/regress/sql/polygon.sql b/src/test/regress/sql/polygon.sql
index 2dad566f379..d95fa964476 100644
--- a/src/test/regress/sql/polygon.sql
+++ b/src/test/regress/sql/polygon.sql
@@ -3,15 +3,15 @@
--
-- polygon logic
--
--- 3 o
--- |
--- 2 + |
--- / |
--- 1 # o +
--- / |
--- 0 #-----o-+
+-- 3 o
+-- |
+-- 2 + |
+-- / |
+-- 1 # +
+-- / o |
+-- 0 #-----o-+
--
--- 0 1 2 3 4
+-- 0 1 2 3 4
--
CREATE TABLE POLYGON_TBL(f1 polygon);
@@ -83,15 +83,16 @@ SELECT '' AS one, p.*
--
-- polygon logic
--
--- 3 o
--- |
--- 2 + |
--- / |
--- 1 / o +
+-- 3 o
+-- /|
+-- 2 + |
+-- / |
+-- 1 / o +
-- / |
--- 0 +-----o-+
+-- 0 +-----o-+
+--
+-- 0 1 2 3 4
--
--- 0 1 2 3 4
--
-- left of
SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' << polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS false;
@@ -155,11 +156,11 @@ SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' ~= polygon '(3.0,1.0),(3.0,3.0),(
SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' && polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS true;
-- +--------------------+
--- | *---* 1
+-- | *---* 1
-- | + | |
-- | 2 *---*
-- +--------------------+
--- 3
+-- 3
-- Edges 1-2, 2-3 are not shown on picture
SELECT '((0,4),(6,4),(1,2),(6,0),(0,0))'::polygon && '((2,1),(2,3),(3,3),(3,1))'::polygon AS "true";