Changeset: a45bb810aaf9 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a45bb810aaf9 Branch: mtest Log Message:
merged diffs (truncated from 15501 to 300 lines): diff --git a/geom/sql/conformance/Tests/All b/geom/sql/conformance/Tests/All --- a/geom/sql/conformance/Tests/All +++ b/geom/sql/conformance/Tests/All @@ -51,4 +51,3 @@ HAVE_GEOM?T49 HAVE_GEOM?T50 HAVE_GEOM?T51 HAVE_GEOM?T52 -HAVE_GEOM?conformance_drop diff --git a/geom/sql/conformance/Tests/T19.test b/geom/sql/conformance/Tests/T19.test deleted file mode 100644 --- a/geom/sql/conformance/Tests/T19.test +++ /dev/null @@ -1,4 +0,0 @@ -statement error -SELECT ST_IsClosed(ST_LineFromWKB(ST_AsBinary(ST_Boundary(ST_WKBToSQL(boundary))),ST_SRID(boundary))) FROM named_places WHERE name = 'Goose Island' - - diff --git a/geom/sql/conformance/Tests/T20.test b/geom/sql/conformance/Tests/T20.test deleted file mode 100644 --- a/geom/sql/conformance/Tests/T20.test +++ /dev/null @@ -1,4 +0,0 @@ -statement error -SELECT ST_IsRing(ST_LineFromWKB(ST_AsBinary(ST_Boundary(ST_WKBToSQL(boundary))),ST_SRID(boundary))) FROM named_places WHERE name = 'Goose Island' - - diff --git a/geom/sql/conformance/Tests/T9.test b/geom/sql/conformance/Tests/T9.test deleted file mode 100644 --- a/geom/sql/conformance/Tests/T9.test +++ /dev/null @@ -1,4 +0,0 @@ -statement error -SELECT ST_AsText(ST_PolygonFromWKB(ST_AsBinary(ST_WKBToSQL(boundary)),101)) FROM named_places WHERE name = 'Goose Island' - - diff --git a/geom/sql/conformance/Tests/conformance_drop.modules b/geom/sql/conformance/Tests/conformance_drop.modules deleted file mode 100644 --- a/geom/sql/conformance/Tests/conformance_drop.modules +++ /dev/null @@ -1,1 +0,0 @@ -geom diff --git a/geom/sql/conformance/Tests/conformance_drop.reqtests b/geom/sql/conformance/Tests/conformance_drop.reqtests deleted file mode 100644 --- a/geom/sql/conformance/Tests/conformance_drop.reqtests +++ /dev/null @@ -1,1 +0,0 @@ -conformance_load diff --git a/geom/sql/conformance/Tests/conformance_drop.sql b/geom/sql/conformance/Tests/conformance_drop.sql deleted file mode 100644 --- a/geom/sql/conformance/Tests/conformance_drop.sql +++ /dev/null @@ -1,12 +0,0 @@ -DROP TABLE map_neatlines; -DROP TABLE named_places; -DROP TABLE ponds; -DROP TABLE buildings; -DROP TABLE streams; -DROP TABLE bridges; -DROP TABLE forests; -DROP TABLE divided_routes; -DROP TABLE road_segments; -DROP TABLE lakes; - -DELETE FROM spatial_ref_sys WHERE srid=101; diff --git a/geom/sql/conformance/Tests/conformance_drop.stable.err b/geom/sql/conformance/Tests/conformance_drop.stable.err deleted file mode 100644 --- a/geom/sql/conformance/Tests/conformance_drop.stable.err +++ /dev/null @@ -1,36 +0,0 @@ -stderr of test 'conformance_drop` in directory 'geom/sql/conformance` itself: - - -# 13:34:34 > -# 13:34:34 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=36548" "--set" "mapi_usock=/var/tmp/mtest-11646/.s.monetdb.36548" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/alvanaki/INSTALL/MonetDB-public/var/MonetDB/mTests_geom_sql_Tests_conformance" "--set" "mal_listing=0" -# 13:34:34 > - -# builtin opt gdk_dbpath = /export/scratch1/alvanaki/INSTALL/MonetDB-public/var/monetdb5/dbfarm/demo -# builtin opt gdk_debug = 0 -# builtin opt gdk_vmtrim = no -# builtin opt monet_prompt = > -# builtin opt monet_daemon = no -# builtin opt mapi_port = 50000 -# builtin opt mapi_open = false -# builtin opt mapi_autosense = false -# builtin opt sql_optimizer = default_pipe -# builtin opt sql_debug = 0 -# cmdline opt gdk_nr_threads = 0 -# cmdline opt mapi_open = true -# cmdline opt mapi_port = 36548 -# cmdline opt mapi_usock = /var/tmp/mtest-11646/.s.monetdb.36548 -# cmdline opt monet_prompt = -# cmdline opt mal_listing = 2 -# cmdline opt gdk_dbpath = /export/scratch1/alvanaki/INSTALL/MonetDB-public/var/MonetDB/mTests_geom_sql_Tests_conformance -# cmdline opt mal_listing = 0 -# cmdline opt gdk_debug = 536870922 - -# 13:34:34 > -# 13:34:34 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-11646" "--port=36548" -# 13:34:34 > - - -# 13:34:34 > -# 13:34:34 > "Done." -# 13:34:34 > - diff --git a/geom/sql/conformance/Tests/conformance_drop.stable.out b/geom/sql/conformance/Tests/conformance_drop.stable.out deleted file mode 100644 --- a/geom/sql/conformance/Tests/conformance_drop.stable.out +++ /dev/null @@ -1,42 +0,0 @@ -stdout of test 'conformance_drop` in directory 'geom/sql/conformance` itself: - - -# 13:34:34 > -# 13:34:34 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=36548" "--set" "mapi_usock=/var/tmp/mtest-11646/.s.monetdb.36548" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/alvanaki/INSTALL/MonetDB-public/var/MonetDB/mTests_geom_sql_Tests_conformance" "--set" "mal_listing=0" -# 13:34:34 > - -# MonetDB 5 server v11.20.0 -# This is an unreleased version -# Serving database 'mTests_geom_sql_Tests_conformance', using 8 threads -# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit integers dynamically linked -# Found 15.356 GiB available main-memory. -# Copyright (c) 1993-July 2008 CWI. -# Copyright (c) August 2008-2014 MonetDB B.V., all rights reserved -# Visit http://www.monetdb.org/ for further information -# Listening for connection requests on mapi:monetdb://sibuyan.da.cwi.nl:36548/ -# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-11646/.s.monetdb.36548 -# MonetDB/GIS module loaded -# MonetDB/SQL module loaded - - -# 13:34:34 > -# 13:34:34 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-11646" "--port=36548" -# 13:34:34 > - -#DROP TABLE map_neatlines; -#DROP TABLE named_places; -#DROP TABLE ponds; -#DROP TABLE buildings; -#DROP TABLE streams; -#DROP TABLE bridges; -#DROP TABLE forests; -#DROP TABLE divided_routes; -#DROP TABLE road_segments; -#DROP TABLE lakes; -#DELETE FROM spatial_ref_sys WHERE srid=101; -[ 1 ] - -# 13:34:34 > -# 13:34:34 > "Done." -# 13:34:34 > - diff --git a/geom/sql/conformance/Tests/conformance_drop.test b/geom/sql/conformance/Tests/conformance_drop.test deleted file mode 100644 --- a/geom/sql/conformance/Tests/conformance_drop.test +++ /dev/null @@ -1,34 +0,0 @@ -statement ok -DROP TABLE map_neatlines - -statement ok -DROP TABLE named_places - -statement ok -DROP TABLE ponds - -statement ok -DROP TABLE buildings - -statement ok -DROP TABLE streams - -statement ok -DROP TABLE bridges - -statement ok -DROP TABLE forests - -statement ok -DROP TABLE divided_routes - -statement ok -DROP TABLE road_segments - -statement ok -DROP TABLE lakes - -statement ok -DELETE FROM spatial_ref_sys WHERE srid=101 - - diff --git a/geom/sql/pg_regression/Tests/All b/geom/sql/pg_regression/Tests/All --- a/geom/sql/pg_regression/Tests/All +++ b/geom/sql/pg_regression/Tests/All @@ -75,7 +75,7 @@ HAVE_GEOM?regression_load4D HAVE_GEOM?regress_ogc_cover -HAVE_GEOM?regress_ogc_prep #Unknown Functions: st_containsproperly +#HAVE_GEOM?regress_ogc_prep #Unknown Functions: st_containsproperly #HAVE_GEOM?regress_bdpoly #Unknown Functions: st_buildarea, ST_BdMPolyFromText diff --git a/geom/sql/pg_regression/Tests/affine.test b/geom/sql/pg_regression/Tests/affine.test deleted file mode 100644 --- a/geom/sql/pg_regression/Tests/affine.test +++ /dev/null @@ -1,124 +0,0 @@ -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)) _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
