Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit3d9584c

Browse files
author
Thomas G. Lockhart
committed
Update path and polygon syntax to new conventions.
1 parentad7952a commit3d9584c

File tree

4 files changed

+33
-33
lines changed

4 files changed

+33
-33
lines changed

‎src/test/regress/sql/create_misc.sql

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -144,20 +144,20 @@ INSERT INTO e_star (class, e)
144144
VALUES ('e','-4'::int2);
145145

146146
INSERT INTO f_star (class, a, c, e, f)
147-
VALUES ('f',19,'hi claire'::char16,'-5'::int2,'(1,2,3,4)'::polygon);
147+
VALUES ('f',19,'hi claire'::char16,'-5'::int2,'(1,3),(2,4)'::polygon);
148148

149149
INSERT INTO f_star (class, a, c, e)
150150
VALUES ('f',20,'hi mike'::char16,'-6'::int2);
151151

152152
INSERT INTO f_star (class, a, c, f)
153-
VALUES ('f',21,'hi marcel'::char16,'(11,22,33,44,55,66)'::polygon);
153+
VALUES ('f',21,'hi marcel'::char16,'(11,44),(22,55),(33,66)'::polygon);
154154

155155
INSERT INTO f_star (class, a, e, f)
156-
VALUES ('f',22,'-7'::int2,'(111,222,333,444,555,666,777,888)'::polygon);
156+
VALUES ('f',22,'-7'::int2,'(111,555),(222,666),(333,777),(444,888)'::polygon);
157157

158158
INSERT INTO f_star (class, c, e, f)
159159
VALUES ('f','hi keith'::char16,'-8'::int2,
160-
'(1111,2222,3333,4444)'::polygon);
160+
'(1111,3333),(2222,4444)'::polygon);
161161

162162
INSERT INTO f_star (class, a, c)
163163
VALUES ('f',24,'hi marc'::char16);
@@ -166,17 +166,17 @@ INSERT INTO f_star (class, a, e)
166166
VALUES ('f',25,'-9'::int2);
167167

168168
INSERT INTO f_star (class, a, f)
169-
VALUES ('f',26,'(11111,22222,33333,44444)'::polygon);
169+
VALUES ('f',26,'(11111,33333),(22222,44444)'::polygon);
170170

171171
INSERT INTO f_star (class, c, e)
172172
VALUES ('f','hi allison'::char16,'-10'::int2);
173173

174174
INSERT INTO f_star (class, c, f)
175175
VALUES ('f','hi jeff'::char16,
176-
'(111111,222222,333333,444444)'::polygon);
176+
'(111111,333333),(222222,444444)'::polygon);
177177

178178
INSERT INTO f_star (class, e, f)
179-
VALUES ('f','-11'::int2,'(1111111,2222222,3333333,4444444)'::polygon);
179+
VALUES ('f','-11'::int2,'(1111111,3333333),(2222222,4444444)'::polygon);
180180

181181
INSERT INTO f_star (class, a)VALUES ('f',27);
182182

@@ -185,7 +185,7 @@ INSERT INTO f_star (class, c) VALUES ('f', 'hi carl'::char16);
185185
INSERT INTO f_star (class, e)VALUES ('f','-12'::int2);
186186

187187
INSERT INTO f_star (class, f)
188-
VALUES ('f','(11111111,22222222,33333333,44444444)'::polygon);
188+
VALUES ('f','(11111111,33333333),(22222222,44444444)'::polygon);
189189

190190
INSERT INTO f_star (class)VALUES ('f');
191191

@@ -223,8 +223,8 @@ CREATE TABLE iportaltest (
223223
);
224224

225225
INSERT INTO iportaltest (i, d, p)
226-
VALUES (1,3.567,'(3.0,4.0,1.0,2.0)'::polygon);
226+
VALUES (1,3.567,'(3.0,1.0),(4.0,2.0)'::polygon);
227227

228228
INSERT INTO iportaltest (i, d, p)
229-
VALUES (2,89.05,'(4.0,3.0,2.0,1.0)'::polygon);
229+
VALUES (2,89.05,'(4.0,2.0),(3.0,1.0)'::polygon);
230230

‎src/test/regress/sql/path.sql

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@ INSERT INTO PATH_TBL VALUES ('1,2 ,3,4');
1818

1919
INSERT INTO PATH_TBLVALUES ('[1,2,3, 4]');
2020

21-
-- obsolete v6.0 format (closed,count,x1,y1,...)
22-
INSERT INTO PATH_TBLVALUES ('(0,2,11,12,13,14)');
21+
INSERT INTO PATH_TBLVALUES ('[11,12,13,14]');
2322

24-
INSERT INTO PATH_TBLVALUES ('(1,2,11,12,13,14)');
23+
INSERT INTO PATH_TBLVALUES ('(11,12,13,14)');
2524

2625
-- bad values for parser testing
2726
INSERT INTO PATH_TBLVALUES ('[(,2),(3,4)]');

‎src/test/regress/sql/point.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ SELECT '' AS three, p.* FROM POINT_TBL p
4747
WHERE not on_pb(p.f1,'(0,0,100,100)'::box);
4848

4949
SELECT''AS two, p.*FROM POINT_TBL p
50-
WHERE on_ppath(p.f1,'(0,3,0,0,-10,0,-10,10)'::path);
50+
WHERE on_ppath(p.f1,'[(0,0),(-10,0),(-10,10)]'::path);
5151

5252
SELECT''AS six,p.f1,p.f1<===>'(0,0)'::pointAS dist
5353
FROM POINT_TBL p

‎src/test/regress/sql/polygon.sql

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@
1616
CREATETABLEPOLYGON_TBL(f1polygon);
1717

1818

19-
INSERT INTO POLYGON_TBL(f1)VALUES ('(2.0,2.0,0.0,0.0,4.0,0.0)');
19+
INSERT INTO POLYGON_TBL(f1)VALUES ('(2.0,0.0),(2.0,4.0),(0.0,0.0)');
2020

21-
INSERT INTO POLYGON_TBL(f1)VALUES ('(3.0,3.0,1.0,1.0,3.0,0.0)');
21+
INSERT INTO POLYGON_TBL(f1)VALUES ('(3.0,1.0),(3.0,3.0),(1.0,0.0)');
2222

2323
-- degenerate polygons
2424
INSERT INTO POLYGON_TBL(f1)VALUES ('(0.0,0.0)');
2525

26-
INSERT INTO POLYGON_TBL(f1)VALUES ('(0.0,0.0,1.0,1.0)');
26+
INSERT INTO POLYGON_TBL(f1)VALUES ('(0.0,1.0),(0.0,1.0)');
27+
2728
-- bad polygon input strings
2829
INSERT INTO POLYGON_TBL(f1)VALUES ('0.0');
2930

@@ -41,42 +42,42 @@ SELECT '' AS four, POLYGON_TBL.*;
4142
-- overlap
4243
SELECT''AS three, p.*
4344
FROM POLYGON_TBL p
44-
WHEREp.f1 &&'(3.0,3.0,1.0,1.0,3.0,0.0)';
45+
WHEREp.f1 &&'(3.0,1.0),(3.0,3.0),(1.0,0.0)';
4546

4647
-- left overlap
4748
SELECT''AS four, p.*
4849
FROM POLYGON_TBL p
49-
WHEREp.f1 &<'(3.0,3.0,1.0,1.0,3.0,0.0)';
50+
WHEREp.f1 &<'(3.0,1.0),(3.0,3.0),(1.0,0.0)';
5051

5152
-- right overlap
5253
SELECT''AS two, p.*
5354
FROM POLYGON_TBL p
54-
WHEREp.f1 &>'(3.0,3.0,1.0,1.0,3.0,0.0)';
55+
WHEREp.f1 &>'(3.0,1.0),(3.0,3.0),(1.0,0.0)';
5556

5657
-- left of
5758
SELECT''AS one, p.*
5859
FROM POLYGON_TBL p
59-
WHEREp.f1<<'(3.0,3.0,1.0,1.0,3.0,0.0)';
60+
WHEREp.f1<<'(3.0,1.0),(3.0,3.0),(1.0,0.0)';
6061

6162
-- right of
6263
SELECT''AS zero, p.*
6364
FROM POLYGON_TBL p
64-
WHEREp.f1>>'(3.0,3.0,1.0,1.0,3.0,0.0)';
65+
WHEREp.f1>>'(3.0,1.0),(3.0,3.0),(1.0,0.0)';
6566

6667
-- contained
6768
SELECT''AS one, p.*
6869
FROM POLYGON_TBL p
69-
WHEREp.f1 @'(3.0,3.0,1.0,1.0,3.0,0.0)';
70+
WHEREp.f1 @'(3.0,1.0),(3.0,3.0),(1.0,0.0)';
7071

7172
-- same
7273
SELECT''AS one, p.*
7374
FROM POLYGON_TBL p
74-
WHEREp.f1 ~='(3.0,3.0,1.0,1.0,3.0,0.0)';
75+
WHEREp.f1 ~='(3.0,1.0),(3.0,3.0),(1.0,0.0)';
7576

7677
-- contains
7778
SELECT''AS one, p.*
7879
FROM POLYGON_TBL p
79-
WHEREp.f1 ~'(3.0,3.0,1.0,1.0,3.0,0.0)';
80+
WHEREp.f1 ~'(3.0,1.0),(3.0,3.0),(1.0,0.0)';
8081

8182
--
8283
-- polygon logic
@@ -92,26 +93,26 @@ SELECT '' AS one, p.*
9293
--0 1 2 3 4
9394
--
9495
-- left of
95-
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)'::polygonAS false;
96+
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)'::polygonAS false;
9697

9798
-- left overlap
98-
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)'::polygonAS true;
99+
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)'::polygonAS true;
99100

100101
-- right overlap
101-
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)'::polygonAS true;
102+
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)'::polygonAS true;
102103

103104
-- right of
104-
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)'::polygonAS false;
105+
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)'::polygonAS false;
105106

106107
-- contained in
107-
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)'::polygonAS false;
108+
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)'::polygonAS false;
108109

109110
-- contains
110-
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)'::polygonAS false;
111+
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)'::polygonAS false;
111112

112113
-- same
113-
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)'::polygonAS false;
114+
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)'::polygonAS false;
114115

115116
-- overlap
116-
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)'::polygonAS true;
117+
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)'::polygonAS true;
117118

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp