Changeset: 1a02e1698c5e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1a02e1698c5e
Modified Files:
sql/test/pg_regress/Tests/All
sql/test/pg_regress/Tests/geometry.sql
sql/test/pg_regress/postgresql2sql99.sh
Branch: default
Log Message:
Checked geometry.sql
diffs (83 lines):
diff --git a/sql/test/pg_regress/Tests/All b/sql/test/pg_regress/Tests/All
--- a/sql/test/pg_regress/Tests/All
+++ b/sql/test/pg_regress/Tests/All
@@ -35,6 +35,7 @@ HAVE_GEOM?box # box is not supported
HAVE_GEOM?path # path is not supported in MonetDB but it can be replaced
with linestring
HAVE_GEOM?polygon
#HAVE_GEOM?circle # circle is NOT supported in MonetDB. It is also not part of
OpenGIS standard so exclude this test
+#HAVE_GEOM?geometry # tables CIRCLE_TBL and LSEG_TBL do not exist as they
have been disabled above. All queries fail
date
time
timetz
@@ -46,7 +47,6 @@ reltime
# tinterval NOT supported in MonetDB, deprecated in Postgresql and is also not
standard SQL so exclude this test
inet
comments
-#ToDo HAVE_GEOM?geometry
horology
#ToDo oidjoins
#ToDo type_sanity
diff --git a/sql/test/pg_regress/Tests/geometry.sql
b/sql/test/pg_regress/Tests/geometry.sql
--- a/sql/test/pg_regress/Tests/geometry.sql
+++ b/sql/test/pg_regress/Tests/geometry.sql
@@ -29,22 +29,22 @@ SELECT '' AS two, (@@ f1) AS center
-- "is horizontal" function
SELECT '' AS two, p1.f1
FROM POINT_TBL p1
- WHERE ishorizontal(p1.f1, point '(0,0)');
+ WHERE ishorizontal(p1.f1, point(0,0));
-- "is horizontal" operator
SELECT '' AS two, p1.f1
FROM POINT_TBL p1
- WHERE p1.f1 ?- point '(0,0)';
+ WHERE p1.f1 ?- point(0,0);
-- "is vertical" function
SELECT '' AS one, p1.f1
FROM POINT_TBL p1
- WHERE isvertical(p1.f1, point '(5.1,34.5)');
+ WHERE isvertical(p1.f1, point(5.1,34.5));
-- "is vertical" operator
SELECT '' AS one, p1.f1
FROM POINT_TBL p1
- WHERE p1.f1 ?| point '(5.1,34.5)';
+ WHERE p1.f1 ?| point(5.1,34.5);
--
-- Line segments
@@ -81,7 +81,7 @@ SELECT '' AS twentyfour, b.f1 * p.f1 AS
SELECT '' AS twenty, b.f1 / p.f1 AS rotation
FROM BOX_TBL b, POINT_TBL p
- WHERE (p.f1 <-> point '(0,0)') >= 1;
+ WHERE (p.f1 <-> point(0,0)) >= 1;
--
-- Paths
@@ -94,11 +94,11 @@ SELECT '' AS eight, npoints(f1) AS npoin
SELECT '' AS four, path(f1) FROM POLYGON_TBL;
-- translation
-SELECT '' AS eight, p1.f1 + point '(10,10)' AS dist_add
+SELECT '' AS eight, p1.f1 + point(10,10) AS dist_add
FROM PATH_TBL p1;
-- scaling and rotation
-SELECT '' AS eight, p1.f1 * point '(2,-1)' AS dist_mul
+SELECT '' AS eight, p1.f1 * point(2,-1) AS dist_mul
FROM PATH_TBL p1;
RESET geqo;
diff --git a/sql/test/pg_regress/postgresql2sql99.sh
b/sql/test/pg_regress/postgresql2sql99.sh
--- a/sql/test/pg_regress/postgresql2sql99.sh
+++ b/sql/test/pg_regress/postgresql2sql99.sh
@@ -85,6 +85,7 @@ sed -r \
-e 's/\bbox ''*,*,*,*''/mbr(''linestring('\1' '\2', '\3' '\4')'')/Ig' \
-e 's/\b''(2.0,0.0),(2.0,4.0),(0.0,0.0)''/''polygon((2.0 0.0, 2.0 4.0,
0.0 0.0, 2.0 0.0))''/Ig' \
-e 's/\b''(3.0,1.0),(3.0,3.0),(1.0,0.0)''/''polygon((3.0 1.0, 3.0 3.0,
1.0 0.0, 3.0 1.0))''/Ig' \
+ -e 's/\bpoint ''(*,*)''/point('\1', '\2'))/Ig' \
-e 's/LOG(numeric '10',/LOG10(/Ig' \
-e 's/LOG(/LOG10(/Ig' \
-e 's/LN(/LOG(/Ig' \
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
