Changeset: 9f82e9ca1f00 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9f82e9ca1f00
Branch: default
Log Message:
Merge heads.
diffs (153 lines):
diff --git
a/sql/test/BugTracker-2018/Tests/procedure-create-table.Bug-6604.test
b/sql/test/BugTracker-2018/Tests/procedure-create-table.Bug-6604.test
--- a/sql/test/BugTracker-2018/Tests/procedure-create-table.Bug-6604.test
+++ b/sql/test/BugTracker-2018/Tests/procedure-create-table.Bug-6604.test
@@ -14,9 +14,13 @@ query TTTT rowsort
select "name", "query", "type", "remark" from describe_table('sys', 'x')
----
-statement ok
+query TTTT rowsort
select "name", "type", "language", "remark" from describe_function('sys',
'test')
----
+test
+PROCEDURE
+NULL
+NULL
statement ok
drop procedure test
@@ -34,9 +38,13 @@ query TTTT rowsort
select "name", "query", "type", "remark" from describe_table('sys', 'x')
----
-statement ok
+query TTTT rowsort
select "name", "type", "language", "remark" from describe_function('sys',
'test')
----
+test
+PROCEDURE
+NULL
+NULL
statement ok
drop procedure test
diff --git a/sql/test/BugTracker-2018/Tests/truncate_geom_tables.Bug-6543.test
b/sql/test/BugTracker-2018/Tests/truncate_geom_tables.Bug-6543.test
--- a/sql/test/BugTracker-2018/Tests/truncate_geom_tables.Bug-6543.test
+++ b/sql/test/BugTracker-2018/Tests/truncate_geom_tables.Bug-6543.test
@@ -1,9 +1,13 @@
-statement ok
+query I rowsort
SELECT (COUNT(*) > 0) AS has_rows FROM sys.spatial_ref_sys
+----
+1
statement error
TRUNCATE TABLE sys.spatial_ref_sys
-statement ok
+query I rowsort
SELECT (COUNT(*) > 0) AS has_rows FROM sys.spatial_ref_sys
+----
+1
diff --git
a/sql/test/BugTracker-2018/Tests/truncate_sys_netcdf_tables.Bug-6543.test
b/sql/test/BugTracker-2018/Tests/truncate_sys_netcdf_tables.Bug-6543.test
--- a/sql/test/BugTracker-2018/Tests/truncate_sys_netcdf_tables.Bug-6543.test
+++ b/sql/test/BugTracker-2018/Tests/truncate_sys_netcdf_tables.Bug-6543.test
@@ -1,45 +1,65 @@
-statement ok
+query I rowsort
SELECT (COUNT(*) > 0) AS has_rows FROM sys.netcdf_vars
+----
+0
statement error
TRUNCATE TABLE sys.netcdf_vars
-statement ok
+query I rowsort
SELECT (COUNT(*) > 0) AS has_rows FROM sys.netcdf_vars
+----
+0
-statement ok
+query I rowsort
SELECT (COUNT(*) > 0) AS has_rows FROM sys.netcdf_vardim
+----
+0
statement error
TRUNCATE TABLE sys.netcdf_vardim
-statement ok
+query I rowsort
SELECT (COUNT(*) > 0) AS has_rows FROM sys.netcdf_vardim
+----
+0
-statement ok
+query I rowsort
SELECT (COUNT(*) > 0) AS has_rows FROM sys.netcdf_files
+----
+0
statement error
TRUNCATE TABLE sys.netcdf_files
-statement ok
+query I rowsort
SELECT (COUNT(*) > 0) AS has_rows FROM sys.netcdf_files
+----
+0
-statement ok
+query I rowsort
SELECT (COUNT(*) > 0) AS has_rows FROM sys.netcdf_dims
+----
+0
statement error
TRUNCATE TABLE sys.netcdf_dims
-statement ok
+query I rowsort
SELECT (COUNT(*) > 0) AS has_rows FROM sys.netcdf_dims
+----
+0
-statement ok
+query I rowsort
SELECT (COUNT(*) > 0) AS has_rows FROM sys.netcdf_attrs
+----
+0
statement error
TRUNCATE TABLE sys.netcdf_attrs
-statement ok
+query I rowsort
SELECT (COUNT(*) > 0) AS has_rows FROM sys.netcdf_attrs
+----
+0
diff --git a/sql/test/Tests/sessioncontrol.test
b/sql/test/Tests/sessioncontrol.test
--- a/sql/test/Tests/sessioncontrol.test
+++ b/sql/test/Tests/sessioncontrol.test
@@ -24,8 +24,17 @@ call setworkerlimit(12)
statement ok
call setmemorylimit(8000)
-statement ok
+query ITTIIII rowsort
select sessionid, s."username", s."optimizer", s.sessiontimeout,
s.querytimeout, s.workerlimit, s.memorylimit from sessions as s
+----
+0
+monetdb
+minimal_pipe
+5000
+123
+12
+8000
+
statement error
call setoptimizer('')
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
