From 3d9584c9d96e2f5d4f0fbf748569d7739c5dfbf1 Mon Sep 17 00:00:00 2001 From: "Thomas G. Lockhart" Date: Tue, 3 Jun 1997 14:24:12 +0000 Subject: [PATCH] Update path and polygon syntax to new conventions. --- src/test/regress/sql/create_misc.sql | 20 +++++++------- src/test/regress/sql/path.sql | 5 ++-- src/test/regress/sql/point.sql | 2 +- src/test/regress/sql/polygon.sql | 39 ++++++++++++++-------------- 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/test/regress/sql/create_misc.sql b/src/test/regress/sql/create_misc.sql index d42a6cda69..58ce26a2fc 100644 --- a/src/test/regress/sql/create_misc.sql +++ b/src/test/regress/sql/create_misc.sql @@ -144,20 +144,20 @@ INSERT INTO e_star (class, e) VALUES ('e', '-4'::int2); INSERT INTO f_star (class, a, c, e, f) - VALUES ('f', 19, 'hi claire'::char16, '-5'::int2, '(1,2,3,4)'::polygon); + VALUES ('f', 19, 'hi claire'::char16, '-5'::int2, '(1,3),(2,4)'::polygon); INSERT INTO f_star (class, a, c, e) VALUES ('f', 20, 'hi mike'::char16, '-6'::int2); INSERT INTO f_star (class, a, c, f) - VALUES ('f', 21, 'hi marcel'::char16, '(11,22,33,44,55,66)'::polygon); + VALUES ('f', 21, 'hi marcel'::char16, '(11,44),(22,55),(33,66)'::polygon); INSERT INTO f_star (class, a, e, f) - VALUES ('f', 22, '-7'::int2, '(111,222,333,444,555,666,777,888)'::polygon); + VALUES ('f', 22, '-7'::int2, '(111,555),(222,666),(333,777),(444,888)'::polygon); INSERT INTO f_star (class, c, e, f) VALUES ('f', 'hi keith'::char16, '-8'::int2, - '(1111,2222,3333,4444)'::polygon); + '(1111,3333),(2222,4444)'::polygon); INSERT INTO f_star (class, a, c) VALUES ('f', 24, 'hi marc'::char16); @@ -166,17 +166,17 @@ INSERT INTO f_star (class, a, e) VALUES ('f', 25, '-9'::int2); INSERT INTO f_star (class, a, f) - VALUES ('f', 26, '(11111,22222,33333,44444)'::polygon); + VALUES ('f', 26, '(11111,33333),(22222,44444)'::polygon); INSERT INTO f_star (class, c, e) VALUES ('f', 'hi allison'::char16, '-10'::int2); INSERT INTO f_star (class, c, f) VALUES ('f', 'hi jeff'::char16, - '(111111,222222,333333,444444)'::polygon); + '(111111,333333),(222222,444444)'::polygon); INSERT INTO f_star (class, e, f) - VALUES ('f', '-11'::int2, '(1111111,2222222,3333333,4444444)'::polygon); + VALUES ('f', '-11'::int2, '(1111111,3333333),(2222222,4444444)'::polygon); INSERT INTO f_star (class, a) VALUES ('f', 27); @@ -185,7 +185,7 @@ INSERT INTO f_star (class, c) VALUES ('f', 'hi carl'::char16); INSERT INTO f_star (class, e) VALUES ('f', '-12'::int2); INSERT INTO f_star (class, f) - VALUES ('f', '(11111111,22222222,33333333,44444444)'::polygon); + VALUES ('f', '(11111111,33333333),(22222222,44444444)'::polygon); INSERT INTO f_star (class) VALUES ('f'); @@ -223,8 +223,8 @@ CREATE TABLE iportaltest ( ); INSERT INTO iportaltest (i, d, p) - VALUES (1, 3.567, '(3.0,4.0,1.0,2.0)'::polygon); + VALUES (1, 3.567, '(3.0,1.0),(4.0,2.0)'::polygon); INSERT INTO iportaltest (i, d, p) - VALUES (2, 89.05, '(4.0,3.0,2.0,1.0)'::polygon); + VALUES (2, 89.05, '(4.0,2.0),(3.0,1.0)'::polygon); diff --git a/src/test/regress/sql/path.sql b/src/test/regress/sql/path.sql index 8b40b5738e..11a3bb30a7 100644 --- a/src/test/regress/sql/path.sql +++ b/src/test/regress/sql/path.sql @@ -18,10 +18,9 @@ INSERT INTO PATH_TBL VALUES ('1,2 ,3,4'); INSERT INTO PATH_TBL VALUES ('[1,2,3, 4]'); --- obsolete v6.0 format (closed,count,x1,y1,...) -INSERT INTO PATH_TBL VALUES ('(0,2,11,12,13,14)'); +INSERT INTO PATH_TBL VALUES ('[11,12,13,14]'); -INSERT INTO PATH_TBL VALUES ('(1,2,11,12,13,14)'); +INSERT INTO PATH_TBL VALUES ('(11,12,13,14)'); -- bad values for parser testing INSERT INTO PATH_TBL VALUES ('[(,2),(3,4)]'); diff --git a/src/test/regress/sql/point.sql b/src/test/regress/sql/point.sql index 745d8ce634..ac5751b5f6 100644 --- a/src/test/regress/sql/point.sql +++ b/src/test/regress/sql/point.sql @@ -47,7 +47,7 @@ SELECT '' AS three, p.* FROM POINT_TBL p WHERE not on_pb(p.f1,'(0,0,100,100)'::box); SELECT '' AS two, p.* FROM POINT_TBL p - WHERE on_ppath(p.f1,'(0,3,0,0,-10,0,-10,10)'::path); + WHERE on_ppath(p.f1,'[(0,0),(-10,0),(-10,10)]'::path); SELECT '' AS six, p.f1, p.f1 <===> '(0,0)'::point AS dist FROM POINT_TBL p diff --git a/src/test/regress/sql/polygon.sql b/src/test/regress/sql/polygon.sql index f8928545a2..83f453c908 100644 --- a/src/test/regress/sql/polygon.sql +++ b/src/test/regress/sql/polygon.sql @@ -16,14 +16,15 @@ CREATE TABLE POLYGON_TBL(f1 polygon); -INSERT INTO POLYGON_TBL(f1) VALUES ('(2.0,2.0,0.0,0.0,4.0,0.0)'); +INSERT INTO POLYGON_TBL(f1) VALUES ('(2.0,0.0),(2.0,4.0),(0.0,0.0)'); -INSERT INTO POLYGON_TBL(f1) VALUES ('(3.0,3.0,1.0,1.0,3.0,0.0)'); +INSERT INTO POLYGON_TBL(f1) VALUES ('(3.0,1.0),(3.0,3.0),(1.0,0.0)'); -- degenerate polygons INSERT INTO POLYGON_TBL(f1) VALUES ('(0.0,0.0)'); -INSERT INTO POLYGON_TBL(f1) VALUES ('(0.0,0.0,1.0,1.0)'); +INSERT INTO POLYGON_TBL(f1) VALUES ('(0.0,1.0),(0.0,1.0)'); + -- bad polygon input strings INSERT INTO POLYGON_TBL(f1) VALUES ('0.0'); @@ -41,42 +42,42 @@ SELECT '' AS four, POLYGON_TBL.*; -- overlap SELECT '' AS three, p.* FROM POLYGON_TBL p - WHERE p.f1 && '(3.0,3.0,1.0,1.0,3.0,0.0)'; + WHERE p.f1 && '(3.0,1.0),(3.0,3.0),(1.0,0.0)'; -- left overlap SELECT '' AS four, p.* FROM POLYGON_TBL p - WHERE p.f1 &< '(3.0,3.0,1.0,1.0,3.0,0.0)'; + WHERE p.f1 &< '(3.0,1.0),(3.0,3.0),(1.0,0.0)'; -- right overlap SELECT '' AS two, p.* FROM POLYGON_TBL p - WHERE p.f1 &> '(3.0,3.0,1.0,1.0,3.0,0.0)'; + WHERE p.f1 &> '(3.0,1.0),(3.0,3.0),(1.0,0.0)'; -- left of SELECT '' AS one, p.* FROM POLYGON_TBL p - WHERE p.f1 << '(3.0,3.0,1.0,1.0,3.0,0.0)'; + WHERE p.f1 << '(3.0,1.0),(3.0,3.0),(1.0,0.0)'; -- right of SELECT '' AS zero, p.* FROM POLYGON_TBL p - WHERE p.f1 >> '(3.0,3.0,1.0,1.0,3.0,0.0)'; + WHERE p.f1 >> '(3.0,1.0),(3.0,3.0),(1.0,0.0)'; -- contained SELECT '' AS one, p.* FROM POLYGON_TBL p - WHERE p.f1 @ '(3.0,3.0,1.0,1.0,3.0,0.0)'; + WHERE p.f1 @ '(3.0,1.0),(3.0,3.0),(1.0,0.0)'; -- same SELECT '' AS one, p.* FROM POLYGON_TBL p - WHERE p.f1 ~= '(3.0,3.0,1.0,1.0,3.0,0.0)'; + WHERE p.f1 ~= '(3.0,1.0),(3.0,3.0),(1.0,0.0)'; -- contains SELECT '' AS one, p.* FROM POLYGON_TBL p - WHERE p.f1 ~ '(3.0,3.0,1.0,1.0,3.0,0.0)'; + WHERE p.f1 ~ '(3.0,1.0),(3.0,3.0),(1.0,0.0)'; -- -- polygon logic @@ -92,26 +93,26 @@ SELECT '' AS one, p.* -- 0 1 2 3 4 -- -- left of -SELECT '(2.0,2.0,0.0,0.0,4.0,0.0)'::polygon << '(3.0,3.0,1.0,1.0,3.0,0.0)'::polygon AS false; +SELECT '(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)'::polygon AS false; -- left overlap -SELECT '(2.0,2.0,0.0,0.0,4.0,0.0)'::polygon &< '(3.0,3.0,1.0,1.0,3.0,0.0)'::polygon AS true; +SELECT '(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)'::polygon AS true; -- right overlap -SELECT '(2.0,2.0,0.0,0.0,4.0,0.0)'::polygon &> '(3.0,3.0,1.0,1.0,3.0,0.0)'::polygon AS true; +SELECT '(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)'::polygon AS true; -- right of -SELECT '(2.0,2.0,0.0,0.0,4.0,0.0)'::polygon >> '(3.0,3.0,1.0,1.0,3.0,0.0)'::polygon AS false; +SELECT '(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)'::polygon AS false; -- contained in -SELECT '(2.0,2.0,0.0,0.0,4.0,0.0)'::polygon @ '(3.0,3.0,1.0,1.0,3.0,0.0)'::polygon AS false; +SELECT '(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)'::polygon AS false; -- contains -SELECT '(2.0,2.0,0.0,0.0,4.0,0.0)'::polygon ~ '(3.0,3.0,1.0,1.0,3.0,0.0)'::polygon AS false; +SELECT '(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)'::polygon AS false; -- same -SELECT '(2.0,2.0,0.0,0.0,4.0,0.0)'::polygon ~= '(3.0,3.0,1.0,1.0,3.0,0.0)'::polygon AS false; +SELECT '(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)'::polygon AS false; -- overlap -SELECT '(2.0,2.0,0.0,0.0,4.0,0.0)'::polygon && '(3.0,3.0,1.0,1.0,3.0,0.0)'::polygon AS true; +SELECT '(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)'::polygon AS true;