database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-30 11:03:19 +03:00
Code Activity

Update to show new path and polygon syntax.

Browse Source
This commit is contained in:
Thomas G. Lockhart
1997-06-03 14:29:51 +00:00
parent 3d9584c9d9
commit 8aefe09731
5 changed files with 1126 additions and 1126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/test/regress/expected/create_misc.out
View File

@ -85,34 +85,34 @@ QUERY: INSERT INTO e_star (class, c)
QUERY: INSERT INTO e_star (class, e) QUERY: INSERT INTO e_star (class, e)
VALUES ('e', '-4'::int2); VALUES ('e', '-4'::int2);
QUERY: INSERT INTO f_star (class, a, c, e, f) QUERY: 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);
QUERY: INSERT INTO f_star (class, a, c, e) QUERY: INSERT INTO f_star (class, a, c, e)
VALUES ('f', 20, 'hi mike'::char16, '-6'::int2); VALUES ('f', 20, 'hi mike'::char16, '-6'::int2);
QUERY: INSERT INTO f_star (class, a, c, f) QUERY: 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);
QUERY: INSERT INTO f_star (class, a, e, f) QUERY: 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);
QUERY: INSERT INTO f_star (class, c, e, f) QUERY: INSERT INTO f_star (class, c, e, f)
VALUES ('f', 'hi keith'::char16, '-8'::int2, VALUES ('f', 'hi keith'::char16, '-8'::int2,
'(1111,2222,3333,4444)'::polygon); '(1111,3333),(2222,4444)'::polygon);
QUERY: INSERT INTO f_star (class, a, c) QUERY: INSERT INTO f_star (class, a, c)
VALUES ('f', 24, 'hi marc'::char16); VALUES ('f', 24, 'hi marc'::char16);
QUERY: INSERT INTO f_star (class, a, e) QUERY: INSERT INTO f_star (class, a, e)
VALUES ('f', 25, '-9'::int2); VALUES ('f', 25, '-9'::int2);
QUERY: INSERT INTO f_star (class, a, f) QUERY: INSERT INTO f_star (class, a, f)
VALUES ('f', 26, '(11111,22222,33333,44444)'::polygon); VALUES ('f', 26, '(11111,33333),(22222,44444)'::polygon);
QUERY: INSERT INTO f_star (class, c, e) QUERY: INSERT INTO f_star (class, c, e)
VALUES ('f', 'hi allison'::char16, '-10'::int2); VALUES ('f', 'hi allison'::char16, '-10'::int2);
QUERY: INSERT INTO f_star (class, c, f) QUERY: INSERT INTO f_star (class, c, f)
VALUES ('f', 'hi jeff'::char16, VALUES ('f', 'hi jeff'::char16,
'(111111,222222,333333,444444)'::polygon); '(111111,333333),(222222,444444)'::polygon);
QUERY: INSERT INTO f_star (class, e, f) QUERY: 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);
QUERY: INSERT INTO f_star (class, a) VALUES ('f', 27); QUERY: INSERT INTO f_star (class, a) VALUES ('f', 27);
QUERY: INSERT INTO f_star (class, c) VALUES ('f', 'hi carl'::char16); QUERY: INSERT INTO f_star (class, c) VALUES ('f', 'hi carl'::char16);
QUERY: INSERT INTO f_star (class, e) VALUES ('f', '-12'::int2); QUERY: INSERT INTO f_star (class, e) VALUES ('f', '-12'::int2);
QUERY: INSERT INTO f_star (class, f) QUERY: INSERT INTO f_star (class, f)
VALUES ('f', '(11111111,22222222,33333333,44444444)'::polygon); VALUES ('f', '(11111111,33333333),(22222222,44444444)'::polygon);
QUERY: INSERT INTO f_star (class) VALUES ('f'); QUERY: INSERT INTO f_star (class) VALUES ('f');
QUERY: INSERT INTO arrtest (a[5], b[2][1][2], c, d) QUERY: INSERT INTO arrtest (a[5], b[2][1][2], c, d)
VALUES ('{1,2,3,4,5}', '{{{},{1,2}}}', '{}', '{}'); VALUES ('{1,2,3,4,5}', '{{{},{1,2}}}', '{}', '{}');
@ -129,6 +129,6 @@ QUERY: CREATE TABLE iportaltest (
p polygon p polygon
); );
QUERY: INSERT INTO iportaltest (i, d, p) QUERY: 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);
QUERY: INSERT INTO iportaltest (i, d, p) QUERY: 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);

4
src/test/regress/expected/path.out
View File

@ -5,8 +5,8 @@ QUERY: INSERT INTO PATH_TBL VALUES ('[(0,0),(3,0),(4,5),(1,6)]');
QUERY: INSERT INTO PATH_TBL VALUES ('((1,2),(3,4))'); QUERY: INSERT INTO PATH_TBL VALUES ('((1,2),(3,4))');
QUERY: INSERT INTO PATH_TBL VALUES ('1,2 ,3,4'); QUERY: INSERT INTO PATH_TBL VALUES ('1,2 ,3,4');
QUERY: INSERT INTO PATH_TBL VALUES ('[1,2,3, 4]'); QUERY: INSERT INTO PATH_TBL VALUES ('[1,2,3, 4]');
QUERY: INSERT INTO PATH_TBL VALUES ('(0,2,11,12,13,14)'); QUERY: INSERT INTO PATH_TBL VALUES ('[11,12,13,14]');
QUERY: INSERT INTO PATH_TBL VALUES ('(1,2,11,12,13,14)'); QUERY: INSERT INTO PATH_TBL VALUES ('(11,12,13,14)');
QUERY: INSERT INTO PATH_TBL VALUES ('[(,2),(3,4)]'); QUERY: INSERT INTO PATH_TBL VALUES ('[(,2),(3,4)]');
WARN:Bad path external representation '[(,2),(3,4)]' WARN:Bad path external representation '[(,2),(3,4)]'
QUERY: INSERT INTO PATH_TBL VALUES ('[(1,2),(3,4)'); QUERY: INSERT INTO PATH_TBL VALUES ('[(1,2),(3,4)');

2
src/test/regress/expected/point.out
View File

@ -75,7 +75,7 @@ three|f1
(3 rows) (3 rows)
QUERY: SELECT '' AS two, p.* FROM POINT_TBL p QUERY: 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);
two|f1 two|f1
---+------- ---+-------
|(0,0) |(0,0)

88
src/test/regress/expected/polygon.out
View File

@ -1,8 +1,8 @@
QUERY: CREATE TABLE POLYGON_TBL(f1 polygon); QUERY: CREATE TABLE POLYGON_TBL(f1 polygon);
QUERY: INSERT INTO POLYGON_TBL(f1) VALUES ('(2.0,2.0,0.0,0.0,4.0,0.0)'); QUERY: INSERT INTO POLYGON_TBL(f1) VALUES ('(2.0,0.0),(2.0,4.0),(0.0,0.0)');
QUERY: INSERT INTO POLYGON_TBL(f1) VALUES ('(3.0,3.0,1.0,1.0,3.0,0.0)'); QUERY: INSERT INTO POLYGON_TBL(f1) VALUES ('(3.0,1.0),(3.0,3.0),(1.0,0.0)');
QUERY: INSERT INTO POLYGON_TBL(f1) VALUES ('(0.0,0.0)'); QUERY: INSERT INTO POLYGON_TBL(f1) VALUES ('(0.0,0.0)');
QUERY: INSERT INTO POLYGON_TBL(f1) VALUES ('(0.0,0.0,1.0,1.0)'); QUERY: INSERT INTO POLYGON_TBL(f1) VALUES ('(0.0,1.0),(0.0,1.0)');
QUERY: INSERT INTO POLYGON_TBL(f1) VALUES ('0.0'); QUERY: INSERT INTO POLYGON_TBL(f1) VALUES ('0.0');
WARN:Bad polygon external representation '0.0' WARN:Bad polygon external representation '0.0'
QUERY: INSERT INTO POLYGON_TBL(f1) VALUES ('(0.0 0.0'); QUERY: INSERT INTO POLYGON_TBL(f1) VALUES ('(0.0 0.0');
@ -24,7 +24,7 @@ four|f1
QUERY: SELECT '' AS three, p.* QUERY: SELECT '' AS three, p.*
FROM POLYGON_TBL 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)';
three|f1 three|f1
-----+------------------- -----+-------------------
|((2,0),(2,4),(0,0)) |((2,0),(2,4),(0,0))
@ -33,7 +33,7 @@ three|f1
QUERY: SELECT '' AS four, p.* QUERY: SELECT '' AS four, p.*
FROM POLYGON_TBL 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)';
four|f1 four|f1
----+------------------- ----+-------------------
|((2,0),(2,4),(0,0)) |((2,0),(2,4),(0,0))
@ -44,7 +44,7 @@ four|f1
QUERY: SELECT '' AS two, p.* QUERY: SELECT '' AS two, p.*
FROM POLYGON_TBL 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)';
two|f1 two|f1
---+------------------- ---+-------------------
|((2,0),(2,4),(0,0)) |((2,0),(2,4),(0,0))
@ -53,7 +53,7 @@ two|f1
QUERY: SELECT '' AS one, p.* QUERY: SELECT '' AS one, p.*
FROM POLYGON_TBL 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)';
one|f1 one|f1
---+------------- ---+-------------
|((0,0)) |((0,0))
@ -62,14 +62,14 @@ one|f1
QUERY: SELECT '' AS zero, p.* QUERY: SELECT '' AS zero, p.*
FROM POLYGON_TBL 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)';
zero|f1 zero|f1
----+-- ----+--
(0 rows) (0 rows)
QUERY: SELECT '' AS one, p.* QUERY: SELECT '' AS one, p.*
FROM POLYGON_TBL 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)';
one|f1 one|f1
---+------------------- ---+-------------------
|((3,1),(3,3),(1,0)) |((3,1),(3,3),(1,0))
@ -77,7 +77,7 @@ one|f1
QUERY: SELECT '' AS one, p.* QUERY: SELECT '' AS one, p.*
FROM POLYGON_TBL 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)';
one|f1 one|f1
---+------------------- ---+-------------------
|((3,1),(3,3),(1,0)) |((3,1),(3,3),(1,0))
@ -85,55 +85,55 @@ one|f1
QUERY: SELECT '' AS one, p.* QUERY: SELECT '' AS one, p.*
FROM POLYGON_TBL 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)';
one|f1 one|f1
---+------------------- ---+-------------------
|((3,1),(3,3),(1,0)) |((3,1),(3,3),(1,0))
(1 row) (1 row)
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; 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;
false false
----- -----
f f
(1 row) (1 row)
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; 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;
true
----
f
(1 row)
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;
true true
---- ----
t t
(1 row) (1 row)
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; 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;
true false
---- -----
t f
(1 row) (1 row)
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; 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;
false false
----- -----
f f
(1 row) (1 row)
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; 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;
false false
----- -----
f f
(1 row) (1 row)
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; 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;
false false
----- -----
f f
(1 row) (1 row)
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; 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;
false
-----
f
(1 row)
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;
true true
---- ----
t t

2138
src/test/regress/expected/select_views.out
View File

File diff suppressed because it is too large Load Diff