Changeset: 9d55affc93c1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9d55affc93c1
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
sql/test/BugDay_2005-10-06_2.9.3/Tests/CrashMe_SQL_server_crash-2.SF-921673.test
sql/test/BugDay_2005-11-09_2.8/Tests/ORDER_BY_evaluation_error.SF-1023658.test
sql/test/BugTracker-2017/Tests/parsererror.Bug-6381.test
sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.test
sql/test/BugTracker-2018/Tests/groupby_having_orderby_count.Bug-6624.test
sql/test/BugTracker-2019/Tests/alter_table_set_schema.Bug-6701.test
sql/test/BugTracker/Tests/explain.SF-1739353.test
sql/test/SQLancer/Tests/sqlancer03.test
sql/test/SQLancer/Tests/sqlancer07.test
sql/test/bugs/Tests/groupby_having-bug-sf-947600.test
sql/test/bugs/Tests/innerjoin_multiple-bug-sf-943661.test
sql/test/bugs/Tests/select_orderby_alias-bug-sf-1024615.test
sql/test/merge-partitions/Tests/mergepart01.test
sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.test
sql/test/sys-schema/Tests/check_Not_Nullable_columns.test
testing/Mtest.py.in
Branch: nospare
Log Message:
merged changes
diffs (truncated from 214188 to 300 lines):
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -8798,7 +8798,7 @@ stdout of test 'MAL-signatures` in direc
[ "iterator", "next", "command iterator.next(X_1:lng, X_2:lng):lng ",
"ITRnext_lng;", "" ]
[ "iterator", "next", "command iterator.next(X_1:oid, X_2:oid):oid ",
"ITRnext_oid;", "" ]
[ "iterator", "next", "command iterator.next(X_1:sht, X_2:sht):sht ",
"ITRnext_sht;", "" ]
-[ "json", "dump", "pattern json.dump(X_1:json):void ", "JSONdump;",
"" ]
+[ "json", "dump", "pattern json.dump(X_1:json):bat[:str] ",
"JSONdump;", "" ]
[ "json", "filter", "command json.filter(X_1:json, X_2:str):json ",
"JSONfilter;", "" ]
[ "json", "filter", "command json.filter(X_1:json, X_2:bte,
X_3:str):json ", "JSONfilterArrayDefault_bte;", "" ]
[ "json", "filter", "command json.filter(X_1:json, X_2:int,
X_3:str):json ", "JSONfilterArrayDefault_int;", "" ]
diff --git a/clients/Tests/MAL-signatures.stable.out.int128
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -12094,7 +12094,7 @@ stdout of test 'MAL-signatures` in direc
[ "iterator", "next", "command iterator.next(X_1:lng, X_2:lng):lng ",
"ITRnext_lng;", "" ]
[ "iterator", "next", "command iterator.next(X_1:oid, X_2:oid):oid ",
"ITRnext_oid;", "" ]
[ "iterator", "next", "command iterator.next(X_1:sht, X_2:sht):sht ",
"ITRnext_sht;", "" ]
-[ "json", "dump", "pattern json.dump(X_1:json):void ", "JSONdump;",
"" ]
+[ "json", "dump", "pattern json.dump(X_1:json):bat[:str] ",
"JSONdump;", "" ]
[ "json", "filter", "command json.filter(X_1:json, X_2:str):json ",
"JSONfilter;", "" ]
[ "json", "filter", "command json.filter(X_1:json, X_2:bte,
X_3:str):json ", "JSONfilterArrayDefault_bte;", "" ]
[ "json", "filter", "command json.filter(X_1:json, X_2:hge,
X_3:str):json ", "JSONfilterArrayDefault_hge;", "" ]
diff --git a/geom/BugTracker/Tests/X_crash.SF-1971632.test
b/geom/BugTracker/Tests/X_crash.SF-1971632.test
--- a/geom/BugTracker/Tests/X_crash.SF-1971632.test
+++ b/geom/BugTracker/Tests/X_crash.SF-1971632.test
@@ -29,3 +29,4 @@ DROP TABLE geoms
statement ok
set optimizer = 'default_pipe'
+
diff --git a/geom/BugTracker/Tests/copy_into_crash.SF-1975402.test
b/geom/BugTracker/Tests/copy_into_crash.SF-1975402.test
--- a/geom/BugTracker/Tests/copy_into_crash.SF-1975402.test
+++ b/geom/BugTracker/Tests/copy_into_crash.SF-1975402.test
@@ -12,4 +12,3 @@ 45111956, \'POINT(52.0697 4.3723)\'
statement ok
drop table nodes
-
diff --git a/geom/sql/conformance/Tests/T1.test
b/geom/sql/conformance/Tests/T1.test
--- a/geom/sql/conformance/Tests/T1.test
+++ b/geom/sql/conformance/Tests/T1.test
@@ -1,6 +1,15 @@
query T rowsort
SELECT f_table_name FROM geometry_columns ORDER BY f_table_name
----
-11 values hashing to c4c2fd32627fe8478eeeb74c8a76c7c7
+bridges
+buildings
+buildings
+divided_routes
+forests
+lakes
+map_neatlines
+named_places
+ponds
+road_segments
+streams
-
diff --git a/geom/sql/conformance/Tests/T10.test
b/geom/sql/conformance/Tests/T10.test
--- a/geom/sql/conformance/Tests/T10.test
+++ b/geom/sql/conformance/Tests/T10.test
@@ -3,4 +3,3 @@ SELECT ST_SRID(boundary) FROM named_plac
----
101
-
diff --git a/geom/sql/conformance/Tests/T11.test
b/geom/sql/conformance/Tests/T11.test
--- a/geom/sql/conformance/Tests/T11.test
+++ b/geom/sql/conformance/Tests/T11.test
@@ -1,6 +1,5 @@
-query T rowsort
+query I rowsort
SELECT ST_IsEmpty(centerline) FROM road_segments WHERE name = 'Route 5' AND
aliases = 'Main Street'
----
-False
+0
-
diff --git a/geom/sql/conformance/Tests/T12.test
b/geom/sql/conformance/Tests/T12.test
--- a/geom/sql/conformance/Tests/T12.test
+++ b/geom/sql/conformance/Tests/T12.test
@@ -1,6 +1,5 @@
-query T rowsort
+query I rowsort
SELECT ST_IsSimple(shore) FROM lakes WHERE name = 'Blue Lake'
----
-True
+1
-
diff --git a/geom/sql/conformance/Tests/T13.test
b/geom/sql/conformance/Tests/T13.test
--- a/geom/sql/conformance/Tests/T13.test
+++ b/geom/sql/conformance/Tests/T13.test
@@ -3,4 +3,3 @@ SELECT ST_AsText(ST_Boundary(boundary))
----
LINESTRING (67 13, 67 18, 59 18, 59 13, 67 13)
-
diff --git a/geom/sql/conformance/Tests/T14.test
b/geom/sql/conformance/Tests/T14.test
--- a/geom/sql/conformance/Tests/T14.test
+++ b/geom/sql/conformance/Tests/T14.test
@@ -3,4 +3,3 @@ SELECT ST_AsText(ST_Envelope(boundary))
----
POLYGON ((59 13, 67 13, 67 18, 59 18, 59 13))
-
diff --git a/geom/sql/conformance/Tests/T15.test
b/geom/sql/conformance/Tests/T15.test
--- a/geom/sql/conformance/Tests/T15.test
+++ b/geom/sql/conformance/Tests/T15.test
@@ -3,4 +3,3 @@ SELECT ST_X("position") FROM bridges WHE
----
44.000
-
diff --git a/geom/sql/conformance/Tests/T16.test
b/geom/sql/conformance/Tests/T16.test
--- a/geom/sql/conformance/Tests/T16.test
+++ b/geom/sql/conformance/Tests/T16.test
@@ -3,4 +3,3 @@ SELECT ST_Y("position") FROM bridges WHE
----
31.000
-
diff --git a/geom/sql/conformance/Tests/T17.test
b/geom/sql/conformance/Tests/T17.test
--- a/geom/sql/conformance/Tests/T17.test
+++ b/geom/sql/conformance/Tests/T17.test
@@ -3,4 +3,3 @@ SELECT ST_AsText(ST_StartPoint(centerlin
----
POINT (0 18)
-
diff --git a/geom/sql/conformance/Tests/T18.test
b/geom/sql/conformance/Tests/T18.test
--- a/geom/sql/conformance/Tests/T18.test
+++ b/geom/sql/conformance/Tests/T18.test
@@ -3,4 +3,3 @@ SELECT ST_AsText(ST_EndPoint(centerline)
----
POINT (44 31)
-
diff --git a/geom/sql/conformance/Tests/T2.test
b/geom/sql/conformance/Tests/T2.test
--- a/geom/sql/conformance/Tests/T2.test
+++ b/geom/sql/conformance/Tests/T2.test
@@ -3,4 +3,3 @@ SELECT f_geometry_column FROM geometry_c
----
centerline
-
diff --git a/geom/sql/conformance/Tests/T21.test
b/geom/sql/conformance/Tests/T21.test
--- a/geom/sql/conformance/Tests/T21.test
+++ b/geom/sql/conformance/Tests/T21.test
@@ -3,4 +3,3 @@ SELECT ST_Length(centerline) FROM road_s
----
26.000
-
diff --git a/geom/sql/conformance/Tests/T22.test
b/geom/sql/conformance/Tests/T22.test
--- a/geom/sql/conformance/Tests/T22.test
+++ b/geom/sql/conformance/Tests/T22.test
@@ -3,4 +3,3 @@ SELECT ST_NumPoints(centerline) FROM roa
----
5
-
diff --git a/geom/sql/conformance/Tests/T23.test
b/geom/sql/conformance/Tests/T23.test
--- a/geom/sql/conformance/Tests/T23.test
+++ b/geom/sql/conformance/Tests/T23.test
@@ -3,4 +3,3 @@ SELECT ST_AsText(ST_PointN(centerline, 1
----
POINT (10 21)
-
diff --git a/geom/sql/conformance/Tests/T24.test
b/geom/sql/conformance/Tests/T24.test
--- a/geom/sql/conformance/Tests/T24.test
+++ b/geom/sql/conformance/Tests/T24.test
@@ -3,4 +3,3 @@ SELECT ST_AsText(ST_Centroid(boundary))
----
POINT (63 15.5)
-
diff --git a/geom/sql/conformance/Tests/T25.test
b/geom/sql/conformance/Tests/T25.test
--- a/geom/sql/conformance/Tests/T25.test
+++ b/geom/sql/conformance/Tests/T25.test
@@ -1,6 +1,5 @@
-query T rowsort
+query I rowsort
SELECT ST_Contains(boundary, ST_PointOnSurface(boundary)) FROM named_places
WHERE name = 'Goose Island'
----
-True
+1
-
diff --git a/geom/sql/conformance/Tests/T26.test
b/geom/sql/conformance/Tests/T26.test
--- a/geom/sql/conformance/Tests/T26.test
+++ b/geom/sql/conformance/Tests/T26.test
@@ -3,4 +3,3 @@ SELECT ST_Area(boundary) FROM named_plac
----
40.000
-
diff --git a/geom/sql/conformance/Tests/T27.test
b/geom/sql/conformance/Tests/T27.test
--- a/geom/sql/conformance/Tests/T27.test
+++ b/geom/sql/conformance/Tests/T27.test
@@ -3,4 +3,3 @@ SELECT ST_AsText(ST_ExteriorRing(shore))
----
LINESTRING (52 18, 66 23, 73 9, 48 6, 52 18)
-
diff --git a/geom/sql/conformance/Tests/T28.test
b/geom/sql/conformance/Tests/T28.test
--- a/geom/sql/conformance/Tests/T28.test
+++ b/geom/sql/conformance/Tests/T28.test
@@ -3,4 +3,3 @@ SELECT ST_NumInteriorRing(shore) FROM la
----
1
-
diff --git a/geom/sql/conformance/Tests/T29.test
b/geom/sql/conformance/Tests/T29.test
--- a/geom/sql/conformance/Tests/T29.test
+++ b/geom/sql/conformance/Tests/T29.test
@@ -3,4 +3,3 @@ SELECT ST_AsText(ST_InteriorRingN(shore,
----
LINESTRING (59 18, 67 18, 67 13, 59 13, 59 18)
-
diff --git a/geom/sql/conformance/Tests/T3.test
b/geom/sql/conformance/Tests/T3.test
--- a/geom/sql/conformance/Tests/T3.test
+++ b/geom/sql/conformance/Tests/T3.test
@@ -3,4 +3,3 @@ SELECT coord_dimension FROM geometry_col
----
2
-
diff --git a/geom/sql/conformance/Tests/T30.test
b/geom/sql/conformance/Tests/T30.test
--- a/geom/sql/conformance/Tests/T30.test
+++ b/geom/sql/conformance/Tests/T30.test
@@ -3,4 +3,3 @@ SELECT ST_NumGeometries(centerlines) FRO
----
2
-
diff --git a/geom/sql/conformance/Tests/T31.test
b/geom/sql/conformance/Tests/T31.test
--- a/geom/sql/conformance/Tests/T31.test
+++ b/geom/sql/conformance/Tests/T31.test
@@ -3,4 +3,3 @@ SELECT ST_AsText(ST_GeometryN(centerline
----
LINESTRING (16 0, 16 23, 16 48)
-
diff --git a/geom/sql/conformance/Tests/T32.test
b/geom/sql/conformance/Tests/T32.test
--- a/geom/sql/conformance/Tests/T32.test
+++ b/geom/sql/conformance/Tests/T32.test
@@ -1,6 +1,5 @@
-query T rowsort
+query I rowsort
SELECT ST_IsClosed(centerlines) FROM divided_routes WHERE name = 'Route 75'
----
-False
+0
-
diff --git a/geom/sql/conformance/Tests/T33.test
b/geom/sql/conformance/Tests/T33.test
--- a/geom/sql/conformance/Tests/T33.test
+++ b/geom/sql/conformance/Tests/T33.test
@@ -3,4 +3,3 @@ SELECT ST_Length(centerlines) FROM divid
----
96.000
-
diff --git a/geom/sql/conformance/Tests/T34.test
b/geom/sql/conformance/Tests/T34.test
--- a/geom/sql/conformance/Tests/T34.test
+++ b/geom/sql/conformance/Tests/T34.test
@@ -3,4 +3,3 @@ SELECT ST_AsText(ST_Centroid(shores)) FR
----
POINT (25 42)
-
diff --git a/geom/sql/conformance/Tests/T35.test
b/geom/sql/conformance/Tests/T35.test
--- a/geom/sql/conformance/Tests/T35.test
+++ b/geom/sql/conformance/Tests/T35.test
@@ -1,6 +1,5 @@
-query T rowsort
+query I rowsort
SELECT ST_Contains(shores, ST_PointOnSurface(shores)) FROM ponds WHERE fid =
120
----
-True
+1
-
diff --git a/geom/sql/conformance/Tests/T36.test
b/geom/sql/conformance/Tests/T36.test
--- a/geom/sql/conformance/Tests/T36.test
+++ b/geom/sql/conformance/Tests/T36.test
@@ -3,4 +3,3 @@ SELECT ST_Area(shores) FROM ponds WHERE
----
8.000
-
diff --git a/geom/sql/conformance/Tests/T37.test
b/geom/sql/conformance/Tests/T37.test
--- a/geom/sql/conformance/Tests/T37.test
+++ b/geom/sql/conformance/Tests/T37.test
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
