regression: adjust polygon diagrams to not use tabs

Also, small diagram adjustments

Patch by Emre Hasegeli

diff --git a/src/test/regress/expected/polygon.out b/src/test/regress/expected/polygon.out
index b2529027201dd5d82b1bdd9bb902182288285957..33388eb909314bcd82bf4735ef6609359af43afc 100644 (file)
--- 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 2dad566f37982b39d23f36dfdf6920d1bff1dd33..d95fa9644762155129e3d3822bfef68cfa75e17a 100644 (file)
--- 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";