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

Commit8aefe09

Browse files
author
Thomas G. Lockhart
committed
Update to show new path and polygon syntax.
1 parent3d9584c commit8aefe09

File tree

5 files changed

+1075
-1075
lines changed

5 files changed

+1075
-1075
lines changed

‎src/test/regress/expected/create_misc.out

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -85,34 +85,34 @@ QUERY: INSERT INTO e_star (class, c)
8585
QUERY: INSERT INTO e_star (class, e)
8686
VALUES ('e', '-4'::int2);
8787
QUERY: INSERT INTO f_star (class, a, c, e, f)
88-
VALUES ('f', 19, 'hi claire'::char16, '-5'::int2, '(1,2,3,4)'::polygon);
88+
VALUES ('f', 19, 'hi claire'::char16, '-5'::int2, '(1,3),(2,4)'::polygon);
8989
QUERY: INSERT INTO f_star (class, a, c, e)
9090
VALUES ('f', 20, 'hi mike'::char16, '-6'::int2);
9191
QUERY: INSERT INTO f_star (class, a, c, f)
92-
VALUES ('f', 21, 'hi marcel'::char16, '(11,22,33,44,55,66)'::polygon);
92+
VALUES ('f', 21, 'hi marcel'::char16, '(11,44),(22,55),(33,66)'::polygon);
9393
QUERY: INSERT INTO f_star (class, a, e, f)
94-
VALUES ('f', 22, '-7'::int2, '(111,222,333,444,555,666,777,888)'::polygon);
94+
VALUES ('f', 22, '-7'::int2, '(111,555),(222,666),(333,777),(444,888)'::polygon);
9595
QUERY: INSERT INTO f_star (class, c, e, f)
9696
VALUES ('f', 'hi keith'::char16, '-8'::int2,
97-
'(1111,2222,3333,4444)'::polygon);
97+
'(1111,3333),(2222,4444)'::polygon);
9898
QUERY: INSERT INTO f_star (class, a, c)
9999
VALUES ('f', 24, 'hi marc'::char16);
100100
QUERY: INSERT INTO f_star (class, a, e)
101101
VALUES ('f', 25, '-9'::int2);
102102
QUERY: INSERT INTO f_star (class, a, f)
103-
VALUES ('f', 26, '(11111,22222,33333,44444)'::polygon);
103+
VALUES ('f', 26, '(11111,33333),(22222,44444)'::polygon);
104104
QUERY: INSERT INTO f_star (class, c, e)
105105
VALUES ('f', 'hi allison'::char16, '-10'::int2);
106106
QUERY: INSERT INTO f_star (class, c, f)
107107
VALUES ('f', 'hi jeff'::char16,
108-
'(111111,222222,333333,444444)'::polygon);
108+
'(111111,333333),(222222,444444)'::polygon);
109109
QUERY: INSERT INTO f_star (class, e, f)
110-
VALUES ('f', '-11'::int2, '(1111111,2222222,3333333,4444444)'::polygon);
110+
VALUES ('f', '-11'::int2, '(1111111,3333333),(2222222,4444444)'::polygon);
111111
QUERY: INSERT INTO f_star (class, a) VALUES ('f', 27);
112112
QUERY: INSERT INTO f_star (class, c) VALUES ('f', 'hi carl'::char16);
113113
QUERY: INSERT INTO f_star (class, e) VALUES ('f', '-12'::int2);
114114
QUERY: INSERT INTO f_star (class, f)
115-
VALUES ('f', '(11111111,22222222,33333333,44444444)'::polygon);
115+
VALUES ('f', '(11111111,33333333),(22222222,44444444)'::polygon);
116116
QUERY: INSERT INTO f_star (class) VALUES ('f');
117117
QUERY: INSERT INTO arrtest (a[5], b[2][1][2], c, d)
118118
VALUES ('{1,2,3,4,5}', '{{{},{1,2}}}', '{}', '{}');
@@ -129,6 +129,6 @@ QUERY: CREATE TABLE iportaltest (
129129
ppolygon
130130
);
131131
QUERY: INSERT INTO iportaltest (i, d, p)
132-
VALUES (1, 3.567, '(3.0,4.0,1.0,2.0)'::polygon);
132+
VALUES (1, 3.567, '(3.0,1.0),(4.0,2.0)'::polygon);
133133
QUERY: INSERT INTO iportaltest (i, d, p)
134-
VALUES (2, 89.05, '(4.0,3.0,2.0,1.0)'::polygon);
134+
VALUES (2, 89.05, '(4.0,2.0),(3.0,1.0)'::polygon);

‎src/test/regress/expected/path.out

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ QUERY: INSERT INTO PATH_TBL VALUES ('[(0,0),(3,0),(4,5),(1,6)]');
55
QUERY: INSERT INTO PATH_TBL VALUES ('((1,2),(3,4))');
66
QUERY: INSERT INTO PATH_TBL VALUES ('1,2 ,3,4');
77
QUERY: INSERT INTO PATH_TBL VALUES ('[1,2,3, 4]');
8-
QUERY: INSERT INTO PATH_TBL VALUES ('(0,2,11,12,13,14)');
9-
QUERY: INSERT INTO PATH_TBL VALUES ('(1,2,11,12,13,14)');
8+
QUERY: INSERT INTO PATH_TBL VALUES ('[11,12,13,14]');
9+
QUERY: INSERT INTO PATH_TBL VALUES ('(11,12,13,14)');
1010
QUERY: INSERT INTO PATH_TBL VALUES ('[(,2),(3,4)]');
1111
WARN:Bad path external representation '[(,2),(3,4)]'
1212
QUERY: INSERT INTO PATH_TBL VALUES ('[(1,2),(3,4)');

‎src/test/regress/expected/point.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ three|f1
7575
(3 rows)
7676

7777
QUERY: SELECT '' AS two, p.* FROM POINT_TBL p
78-
WHERE on_ppath(p.f1,'(0,3,0,0,-10,0,-10,10)'::path);
78+
WHERE on_ppath(p.f1,'[(0,0),(-10,0),(-10,10)]'::path);
7979
two|f1
8080
---+-------
8181
|(0,0)

‎src/test/regress/expected/polygon.out

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
QUERY: CREATE TABLE POLYGON_TBL(f1 polygon);
2-
QUERY: INSERT INTO POLYGON_TBL(f1) VALUES ('(2.0,2.0,0.0,0.0,4.0,0.0)');
3-
QUERY: INSERT INTO POLYGON_TBL(f1) VALUES ('(3.0,3.0,1.0,1.0,3.0,0.0)');
2+
QUERY: INSERT INTO POLYGON_TBL(f1) VALUES ('(2.0,0.0),(2.0,4.0),(0.0,0.0)');
3+
QUERY: INSERT INTO POLYGON_TBL(f1) VALUES ('(3.0,1.0),(3.0,3.0),(1.0,0.0)');
44
QUERY: INSERT INTO POLYGON_TBL(f1) VALUES ('(0.0,0.0)');
5-
QUERY: INSERT INTO POLYGON_TBL(f1) VALUES ('(0.0,0.0,1.0,1.0)');
5+
QUERY: INSERT INTO POLYGON_TBL(f1) VALUES ('(0.0,1.0),(0.0,1.0)');
66
QUERY: INSERT INTO POLYGON_TBL(f1) VALUES ('0.0');
77
WARN:Bad polygon external representation '0.0'
88
QUERY: INSERT INTO POLYGON_TBL(f1) VALUES ('(0.0 0.0');
@@ -24,7 +24,7 @@ four|f1
2424

2525
QUERY: SELECT '' AS three, p.*
2626
FROM POLYGON_TBL p
27-
WHERE p.f1 && '(3.0,3.0,1.0,1.0,3.0,0.0)';
27+
WHERE p.f1 && '(3.0,1.0),(3.0,3.0),(1.0,0.0)';
2828
three|f1
2929
-----+-------------------
3030
|((2,0),(2,4),(0,0))
@@ -33,7 +33,7 @@ three|f1
3333

3434
QUERY: SELECT '' AS four, p.*
3535
FROM POLYGON_TBL p
36-
WHERE p.f1 &< '(3.0,3.0,1.0,1.0,3.0,0.0)';
36+
WHERE p.f1 &< '(3.0,1.0),(3.0,3.0),(1.0,0.0)';
3737
four|f1
3838
----+-------------------
3939
|((2,0),(2,4),(0,0))
@@ -44,7 +44,7 @@ four|f1
4444

4545
QUERY: SELECT '' AS two, p.*
4646
FROM POLYGON_TBL p
47-
WHERE p.f1 &> '(3.0,3.0,1.0,1.0,3.0,0.0)';
47+
WHERE p.f1 &> '(3.0,1.0),(3.0,3.0),(1.0,0.0)';
4848
two|f1
4949
---+-------------------
5050
|((2,0),(2,4),(0,0))
@@ -53,7 +53,7 @@ two|f1
5353

5454
QUERY: SELECT '' AS one, p.*
5555
FROM POLYGON_TBL p
56-
WHERE p.f1 << '(3.0,3.0,1.0,1.0,3.0,0.0)';
56+
WHERE p.f1 << '(3.0,1.0),(3.0,3.0),(1.0,0.0)';
5757
one|f1
5858
---+-------------
5959
|((0,0))
@@ -62,78 +62,78 @@ one|f1
6262

6363
QUERY: SELECT '' AS zero, p.*
6464
FROM POLYGON_TBL p
65-
WHERE p.f1 >> '(3.0,3.0,1.0,1.0,3.0,0.0)';
65+
WHERE p.f1 >> '(3.0,1.0),(3.0,3.0),(1.0,0.0)';
6666
zero|f1
6767
----+--
6868
(0 rows)
6969

7070
QUERY: SELECT '' AS one, p.*
7171
FROM POLYGON_TBL p
72-
WHERE p.f1 @ '(3.0,3.0,1.0,1.0,3.0,0.0)';
72+
WHERE p.f1 @ '(3.0,1.0),(3.0,3.0),(1.0,0.0)';
7373
one|f1
7474
---+-------------------
7575
|((3,1),(3,3),(1,0))
7676
(1 row)
7777

7878
QUERY: SELECT '' AS one, p.*
7979
FROM POLYGON_TBL p
80-
WHERE p.f1 ~= '(3.0,3.0,1.0,1.0,3.0,0.0)';
80+
WHERE p.f1 ~= '(3.0,1.0),(3.0,3.0),(1.0,0.0)';
8181
one|f1
8282
---+-------------------
8383
|((3,1),(3,3),(1,0))
8484
(1 row)
8585

8686
QUERY: SELECT '' AS one, p.*
8787
FROM POLYGON_TBL p
88-
WHERE p.f1 ~ '(3.0,3.0,1.0,1.0,3.0,0.0)';
88+
WHERE p.f1 ~ '(3.0,1.0),(3.0,3.0),(1.0,0.0)';
8989
one|f1
9090
---+-------------------
9191
|((3,1),(3,3),(1,0))
9292
(1 row)
9393

94-
QUERY: 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;
94+
QUERY: 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;
9595
false
9696
-----
9797
f
9898
(1 row)
9999

100-
QUERY: 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;
100+
QUERY: 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;
101101
true
102102
----
103-
t
103+
f
104104
(1 row)
105105

106-
QUERY: 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;
106+
QUERY: 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;
107107
true
108108
----
109109
t
110110
(1 row)
111111

112-
QUERY: 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;
112+
QUERY: 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;
113113
false
114114
-----
115115
f
116116
(1 row)
117117

118-
QUERY: 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;
118+
QUERY: 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;
119119
false
120120
-----
121121
f
122122
(1 row)
123123

124-
QUERY: 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;
124+
QUERY: 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;
125125
false
126126
-----
127127
f
128128
(1 row)
129129

130-
QUERY: 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;
130+
QUERY: 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;
131131
false
132132
-----
133133
f
134134
(1 row)
135135

136-
QUERY: 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;
136+
QUERY: 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;
137137
true
138138
----
139139
t

0 commit comments

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