Changeset: c1012faa98ee for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c1012faa98ee
Modified Files:
testing/Mconvert.py.in
Branch: mtest
Log Message:
merge
diffs (truncated from 19488 to 300 lines):
diff --git a/clients/Tests/MAL-signatures.test
b/clients/Tests/MAL-signatures.test
--- a/clients/Tests/MAL-signatures.test
+++ b/clients/Tests/MAL-signatures.test
@@ -1,6 +1,6 @@
query TTTTT rowsort
select * from sys.malfunctions() order by module, "function", address,
signature, comment
----
-64110 values hashing to 2c8d260ec221c669a3c878cf04340222
+65490 values hashing to ca0241b9eab8bb582f3f93a7fd008dd8
diff --git a/geom/sql/pg_regression/Tests/affine.test
b/geom/sql/pg_regression/Tests/affine.test
new file mode 100644
--- /dev/null
+++ b/geom/sql/pg_regression/Tests/affine.test
@@ -0,0 +1,124 @@
+query TT rowsort
+select 'ST_Translate', ST_asewkt(ST_Translate('POINT(0 0)', 5, 12))
+----
+ST_Translate
+SRID:0;POINT (5 12)
+
+query TT rowsort
+select 'ST_Translate', ST_asewkt(ST_Translate('POINT(0 0 0)', -3, -7, 3))
+----
+ST_Translate
+SRID:0;POINT Z (-3 -7 3)
+
+statement error
+select 'ST_Scale', ST_asewkt(ST_Scale('POINT(1 1)', 5, 5))
+
+statement error
+select 'ST_Scale', ST_asewkt(ST_Scale('POINT(1 1)', 3, 2))
+
+statement error
+select 'ST_Scale', ST_asewkt(ST_Scale('POINT(10 20 -5)', 4, 2, -8))
+
+statement error
+select 'ST_Rotate', ST_asewkt(ST_SnapToGrid(ST_Rotate('POINT(1 1)', pi()/2,
10.0, 20.0), 0.1))
+
+statement error
+select 'ST_Rotate', ST_asewkt(ST_SnapToGrid(ST_Rotate('POINT(1 1)', -pi()/2,
-1.0, 2.0), 0.1))
+
+statement error
+select 'ST_Rotate', ST_asewkt(ST_SnapToGrid(ST_Rotate('POINT(1 1)', pi()/2,
'POINT(10 10)'), 0.1))
+
+statement error
+select 'ST_Rotate', ST_asewkt(ST_SnapToGrid(ST_Rotate('POINT(1 1)', pi()/2,
ST_Centroid('LINESTRING(0 0, 1 0)')), 0.1))
+
+statement error
+select 'ST_RotateZ', ST_asewkt(ST_SnapToGrid(ST_RotateZ('POINT(1 1)', pi()),
0.1))
+
+statement error
+select 'ST_RotateZ', ST_asewkt(ST_SnapToGrid(ST_RotateZ('POINT(1 1)', pi()/2),
0.1))
+
+statement error
+select 'ST_RotateZ', ST_asewkt(ST_SnapToGrid(ST_RotateZ('POINT(1 1)',
pi()+pi()/2), 0.1))
+
+statement error
+select 'ST_RotateZ', ST_asewkt(ST_SnapToGrid(ST_RotateZ('POINT(1 1)', 2*pi()),
0.1))
+
+statement error
+select 'ST_RotateY', ST_asewkt(ST_SnapToGrid(ST_RotateY('POINT(1 1 1)', pi()),
0.1))
+
+statement error
+select 'ST_RotateY', ST_asewkt(ST_SnapToGrid(ST_RotateY('POINT(1 1 1)',
pi()/2), 0.1))
+
+statement error
+select 'ST_RotateY', ST_asewkt(ST_SnapToGrid(ST_RotateY('POINT(1 1 1)',
pi()+pi()/2), 0.1))
+
+statement error
+select 'ST_RotateY', ST_asewkt(ST_SnapToGrid(ST_RotateY('POINT(1 1 1)',
2*pi()), 0.1))
+
+statement error
+select 'ST_RotateX', ST_asewkt(ST_SnapToGrid(ST_RotateX('POINT(1 1 1)', pi()),
0.1))
+
+statement error
+select 'ST_RotateX', ST_asewkt(ST_SnapToGrid(ST_RotateX('POINT(1 1 1)',
pi()/2), 0.1))
+
+statement error
+select 'ST_RotateX', ST_asewkt(ST_SnapToGrid(ST_RotateX('POINT(1 1 1)',
pi()+pi()/2), 0.1))
+
+statement error
+select 'ST_RotateX', ST_asewkt(ST_SnapToGrid(ST_RotateX('POINT(1 1 1)',
2*pi()), 0.1))
+
+statement error
+select 'ST_TransScale', ST_asewkt(ST_snapToGrid(ST_TransScale('POINT(1 1)',1,
1, 1, 1), 0.1))
+
+statement error
+select 'ST_TransScale', ST_asewkt(ST_snapToGrid(ST_TransScale('POINT(2 2)',1,
1, 1, 1), 0.1))
+
+statement error
+select 'ST_TransScale', ST_asewkt(ST_snapToGrid(ST_TransScale('POINT(1 1)',-1,
-1, -1, -1), 0.1))
+
+statement error
+select 'ST_TransScale', ST_asewkt(ST_snapToGrid(ST_TransScale('POINT(1 1)',0,
1, 1, 1), 0.1))
+
+statement error
+select 'ST_TransScale', ST_asewkt(ST_snapToGrid(ST_TransScale('POINT(1 1)',1,
0, 1, 1), 0.1))
+
+statement error
+select 'ST_TransScale', ST_asewkt(ST_snapToGrid(ST_TransScale('POINT(1 1)',1,
1, 0, 1), 0.1))
+
+statement error
+select 'ST_TransScale', ST_asewkt(ST_snapToGrid(ST_TransScale('POINT(1 1)',1,
1, 1, 0), 0.1))
+
+statement error
+select 'ST_TransScale', ST_asewkt(ST_snapToGrid(ST_TransScale('POINT(1 1)',2,
1, 1, 1), 0.1))
+
+statement error
+select 'ST_TransScale', ST_asewkt(ST_snapToGrid(ST_TransScale('POINT(1 1)',1,
2, 1, 1), 0.1))
+
+statement error
+select 'ST_TransScale', ST_asewkt(ST_snapToGrid(ST_TransScale('POINT(1 1)',1,
1, 2, 1), 0.1))
+
+statement error
+select 'ST_TransScale', ST_asewkt(ST_snapToGrid(ST_TransScale('POINT(1 1)',1,
1, 1, 2), 0.1))
+
+statement error
+select 'ST_TransScale', ST_asewkt(ST_snapToGrid(ST_TransScale('POINT(1 1)',2,
3, 5, 7), 0.1))
+
+statement error
+select 'ST_TransScale', ST_asewkt(ST_snapToGrid(ST_TransScale('POINT(1 1
1)',2, 3, 5, 7), 0.1))
+
+statement error
+select 'transl_bbox', box2d(ST_Translate('LINESTRING(0 0, 1 1)', 1, 0, 0))
+
+statement error
+select 'ST_Scale_bbox', box2d(ST_Scale('LINESTRING(1 0, 2 1)', 2, 0))
+
+statement error
+select 'ST_Scale_bbox', box2d(ST_TransScale('LINESTRING(1 0, 2 1)', 2, 1, 1,
1))
+
+statement error
+select 'ST_RotZ_bbox', box2d(ST_SnapToGrid(ST_RotateZ('LINESTRING(0 0, 1 0)',
pi()), 0.1))
+
+statement error
+select 'ST_RotY_bbox', box2d(ST_SnapToGrid(ST_RotateY('LINESTRING(0 0, 1 0)',
pi()), 0.1))
+
+
diff --git a/geom/sql/pg_regression/Tests/bestsrid.test
b/geom/sql/pg_regression/Tests/bestsrid.test
new file mode 100644
--- /dev/null
+++ b/geom/sql/pg_regression/Tests/bestsrid.test
@@ -0,0 +1,32 @@
+statement error
+select x, y, _ST_BestSRID(ST_Point(x, y))
+from ( select 0 as x, -70 as y ) as foo
+
+statement error
+select x, y, _ST_BestSRID(ST_Point(x, y))
+from ( select 0 as x, 70 as y ) as foo
+
+statement error
+select x, 60, _ST_BestSRID(ST_Point(x, 60))
+from generate_series(-177, 177, 6) as x
+
+statement error
+select -180, 60, _ST_BestSRID(ST_Point(-180, 60))
+
+statement error
+select 180, 60, _ST_BestSRID(ST_Point(180, 60))
+
+statement error
+select x, -60, _ST_BestSRID(ST_Point(x, -60))
+from generate_series(-177, 177, 6) as x
+
+statement error
+select -180, -60, _ST_BestSRID(ST_Point(-180, -60))
+
+statement error
+select 180, -60, _ST_BestSRID(ST_Point(180, -60))
+
+statement error
+select 'world', _ST_BestSRID(ST_Point(-160, -40), ST_Point(160, 40))
+
+
diff --git a/geom/sql/pg_regression/Tests/binary.test
b/geom/sql/pg_regression/Tests/binary.test
new file mode 100644
--- /dev/null
+++ b/geom/sql/pg_regression/Tests/binary.test
@@ -0,0 +1,118 @@
+statement ok
+CREATE SCHEMA tm
+
+statement ok
+CREATE TABLE tm.geoms (id serial, g geometry)
+
+statement error
+INSERT INTO tm.geoms(g) values ('POINT EMPTY')
+
+statement ok
+INSERT INTO tm.geoms(g) values ('LINESTRING EMPTY')
+
+statement ok
+INSERT INTO tm.geoms(g) values ('POLYGON EMPTY')
+
+statement ok
+INSERT INTO tm.geoms(g) values ('MULTIPOINT EMPTY')
+
+statement ok
+INSERT INTO tm.geoms(g) values ('MULTILINESTRING EMPTY')
+
+statement ok
+INSERT INTO tm.geoms(g) values ('MULTIPOLYGON EMPTY')
+
+statement ok
+INSERT INTO tm.geoms(g) values ('GEOMETRYCOLLECTION EMPTY')
+
+statement error
+INSERT INTO tm.geoms(g) values ('CIRCULARSTRING EMPTY')
+
+statement error
+INSERT INTO tm.geoms(g) values ('COMPOUNDCURVE EMPTY')
+
+statement error
+INSERT INTO tm.geoms(g) values ('CURVEPOLYGON EMPTY')
+
+statement error
+INSERT INTO tm.geoms(g) values ('MULTICURVE EMPTY')
+
+statement error
+INSERT INTO tm.geoms(g) values ('MULTISURFACE EMPTY')
+
+statement ok
+INSERT INTO tm.geoms(g) values ('POLYHEDRALSURFACE EMPTY')
+
+statement error
+INSERT INTO tm.geoms(g) values ('TRIANGLE EMPTY')
+
+statement error
+INSERT INTO tm.geoms(g) values ('TIN EMPTY')
+
+statement error
+INSERT INTO tm.geoms(g)
+SELECT st_force3dz(g) FROM tm.geoms WHERE id < 15 ORDER BY id
+
+statement error
+INSERT INTO tm.geoms(g)
+SELECT st_force3dm(g) FROM tm.geoms WHERE id < 15 ORDER BY id
+
+statement error
+INSERT INTO tm.geoms(g)
+SELECT st_force4d(g) FROM tm.geoms WHERE id < 15 ORDER BY id
+
+statement ok
+INSERT INTO tm.geoms(g)
+SELECT st_setsrid(g,4326) FROM tm.geoms ORDER BY id
+
+statement error
+COPY select * from tm.geoms INTO
E'/Users/jennie/monet/mtest/geom/sql/pg_regression/Tests/tmpfile_1'
+
+statement ok
+CREATE TABLE tm.geoms_in AS SELECT * FROM tm.geoms WITH NO DATA
+
+statement error
+COPY INTO tm.geoms_in FROM
E'/Users/jennie/monet/mtest/geom/sql/pg_regression/Tests/tmpfile_1'
+
+statement error
+SELECT 'geometry', count(*) FROM tm.geoms_in i, tm.geoms o WHERE i.id = o.id
+ AND ST_OrderingEquals(i.g, o.g)
+
+statement ok
+CREATE TABLE tm.geogs AS SELECT id,g FROM tm.geoms
+WHERE geometrytype(g) NOT LIKE '%CURVE%'
+ AND geometrytype(g) NOT LIKE '%CIRCULAR%'
+ AND geometrytype(g) NOT LIKE '%SURFACE%'
+ AND geometrytype(g) NOT LIKE 'TRIANGLE%'
+ AND geometrytype(g) NOT LIKE 'TIN%'
+WITH DATA
+
+statement error
+COPY select * from tm.geogs INTO
E'/Users/jennie/monet/mtest/geom/sql/pg_regression/Tests/tmpfile_2'
+
+statement ok
+CREATE TABLE tm.geogs_in AS SELECT * FROM tm.geogs WITH NO DATA
+
+statement error
+COPY INTO tm.geogs_in FROM
E'/Users/jennie/monet/mtest/geom/sql/pg_regression/Tests/tmpfile_2'
+
+statement error
+SELECT 'geometry', count(*) FROM tm.geogs_in i, tm.geogs o WHERE i.id = o.id
+ AND ST_OrderingEquals(i.g, o.g)
+
+statement ok
+DROP SCHEMA tm CASCADE
+
+
+statement ok
+COPY select * from tm.geoms INTO E'$QTSTSRCDIR/tmpfile_1';
+
+statement ok
+COPY INTO tm.geoms_in FROM E'$QTSTSRCDIR/tmpfile_1';
+
+statement ok
+COPY select * from tm.geogs INTO E'$QTSTSRCDIR/tmpfile_2';
+
+statement ok
+COPY INTO tm.geogs_in FROM E'$QTSTSRCDIR/tmpfile_2';
+
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
