Changeset: 265b0bd7f73d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=265b0bd7f73d
Removed Files:
sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.sql
sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.stable.err.int128
sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.stable.out.int128
sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.test
Branch: mtest
Log Message:
merge heads
diffs (truncated from 7344 to 300 lines):
diff --git a/sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.sql
b/sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.py
rename from sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.sql
rename to sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.py
--- a/sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.sql
+++ b/sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.py
@@ -1,3 +1,7 @@
-select 'a'+1;
-select 1-'a';
-select true+1;
+from MonetDBtesting.sqltest import SQLTestCase
+
+with SQLTestCase() as tc:
+ tc.connect(username="monetdb", password="monetdb")
+ tc.execute("select 'a'+1;").assertFailed()
+ tc.execute("select 1-'a';").assertFailed()
+ tc.execute("select
true+1;").assertSucceeded().assertDataResultMatch([(2,)])
diff --git
a/sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.stable.err
b/sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.stable.err
--- a/sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.stable.err
+++ b/sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.stable.err
@@ -5,88 +5,6 @@ stderr of test 'mixed_type.SF-917372` in
# 19:21:06 > mserver5
"--config=/ufs/niels/scratch/monetdb/Linux-x86_64/etc/monetdb5.conf" --debug=10
--set gdk_nr_threads=4 --set
"monet_mod_path=/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB5/dbfarm"
--set
"sql_logdir=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB5/sql_logs"
--set mapi_open=true --set xrpc_open=true --set mapi_port=33392 --set
xrpc_port=40415 --set monet_prompt= --trace
"--dbname=mTests_src_test_BugDay_2005-10-06_2.8" --set mal_listing=0 "--dbinit=
include sql;" ; echo ; echo Over..
# 19:21:06 >
-# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
-# builtin opt gdk_version = 1.27.0
-# builtin opt monet_pid = 25524
-# builtin opt prefix = /ufs/niels/scratch/monetdb/Linux-x86_64
-# builtin opt exec_prefix = ${prefix}
-# builtin opt gdk_dbname = tst
-# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB
-# builtin opt gdk_debug = 8
-# builtin opt gdk_mem_bigsize = 262144
-# builtin opt gdk_alloc_map = yes
-# builtin opt gdk_mem_pagebits = 14
-# builtin opt gdk_vmtrim = yes
-# builtin opt monet_admin = adm
-# builtin opt monet_prompt = >
-# builtin opt monet_welcome = yes
-# builtin opt monet_mod_path =
${exec_prefix}/lib/MonetDB:${exec_prefix}/lib/bin
-# builtin opt monet_daemon = yes
-# builtin opt host = localhost
-# builtin opt mapi_port = 50000
-# builtin opt mapi_noheaders = no
-# builtin opt mapi_debug = 0
-# builtin opt mapi_clients = 2
-# builtin opt sql_debug = 0
-# builtin opt sql_logdir = ${prefix}/var/MonetDB
-# builtin opt xquery_logdir = ${prefix}/var/MonetDB
-# builtin opt standoff_ns = http://monetdb.cwi.nl/standoff
-# builtin opt standoff_start = start
-# builtin opt standoff_end = end
-# config opt prefix = /ufs/niels/scratch/monetdb/Linux-x86_64
-# config opt config = ${prefix}/etc/monetdb5.conf
-# config opt prefix = /ufs/niels/scratch/monetdb/Linux-x86_64
-# config opt exec_prefix = ${prefix}
-# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
-# config opt gdk_dbname = demo
-# config opt gdk_alloc_map = no
-# config opt gdk_embedded = no
-# config opt gdk_debug = 0
-# config opt monet_mod_path =
${exec_prefix}/lib/MonetDB5:${exec_prefix}/lib/MonetDB5/lib:${exec_prefix}/lib/MonetDB5/bin
-# config opt monet_daemon = no
-# config opt monet_welcome = yes
-# config opt mero_msglog = ${prefix}/var/log/merovingian.log
-# config opt mero_errlog = ${prefix}/var/log/merovingian.log
-# config opt mero_timeinterval = 600
-# config opt mero_pidfile = ${prefix}/var/run/merovingian.pid
-# config opt mero_exittimeout = 7
-# config opt mero_doproxy = yes
-# config opt mero_discoveryttl = 600
-# config opt mal_init = ${exec_prefix}/lib/MonetDB5/mal_init.mal
-# config opt mal_listing = 2
-# config opt checkpoint_dir = ${prefix}/var/MonetDB5/chkpnt
-# config opt mapi_port = 50000
-# config opt mapi_open = false
-# config opt sql_logdir = ${prefix}/var/MonetDB5/sql_logs
-# config opt sql_init = ${exec_prefix}/lib/MonetDB5/sql_init.sql
-# cmdline opt config =
/ufs/niels/scratch/monetdb/Linux-x86_64/etc/monetdb5.conf
-# cmdline opt gdk_nr_threads = 4
-# cmdline opt monet_mod_path =
/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5/bin
-# cmdline opt gdk_dbfarm =
/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB5/dbfarm
-# cmdline opt sql_logdir =
/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB5/sql_logs
-# cmdline opt mapi_open = true
-# cmdline opt xrpc_open = true
-# cmdline opt mapi_port = 33392
-# cmdline opt xrpc_port = 40415
-# cmdline opt monet_prompt =
-# cmdline opt gdk_dbname = mTests_src_test_BugDay_2005-10-06_2.8
-# cmdline opt mal_listing = 0
-# cmdline opt gdk_debug = 10
-#warning: please don't forget to set your vault key!
-#(see /ufs/niels/scratch/monetdb/Linux-x86_64/etc/monetdb5.conf)
-
-# 19:21:06 >
-# 19:21:06 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=33392
-# 19:21:06 >
-
-MAPI = (monetdb) /var/tmp/mtest-10022/.s.monetdb.31381
-QUERY = select 'a'+1;
-ERROR = !conversion of string 'a' to type lng failed.
-CODE = 22018
-MAPI = (monetdb) /var/tmp/mtest-2179869/.s.monetdb.37655
-QUERY = select 1-'a';
-ERROR = !conversion of string 'a' to type lng failed.
-CODE = 22018
# 19:21:06 >
# 19:21:06 > Done.
diff --git
a/sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.stable.err.int128
b/sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.stable.err.int128
deleted file mode 100644
---
a/sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.stable.err.int128
+++ /dev/null
@@ -1,94 +0,0 @@
-stderr of test 'mixed_type.SF-917372` in directory
'sql/test/BugDay_2005-10-06_2.8` itself:
-
-
-# 19:21:06 >
-# 19:21:06 > mserver5
"--config=/ufs/niels/scratch/monetdb/Linux-x86_64/etc/monetdb5.conf" --debug=10
--set gdk_nr_threads=4 --set
"monet_mod_path=/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB5/dbfarm"
--set
"sql_logdir=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB5/sql_logs"
--set mapi_open=true --set xrpc_open=true --set mapi_port=33392 --set
xrpc_port=40415 --set monet_prompt= --trace
"--dbname=mTests_src_test_BugDay_2005-10-06_2.8" --set mal_listing=0 "--dbinit=
include sql;" ; echo ; echo Over..
-# 19:21:06 >
-
-# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
-# builtin opt gdk_version = 1.27.0
-# builtin opt monet_pid = 25524
-# builtin opt prefix = /ufs/niels/scratch/monetdb/Linux-x86_64
-# builtin opt exec_prefix = ${prefix}
-# builtin opt gdk_dbname = tst
-# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB
-# builtin opt gdk_debug = 8
-# builtin opt gdk_mem_bigsize = 262144
-# builtin opt gdk_alloc_map = yes
-# builtin opt gdk_mem_pagebits = 14
-# builtin opt gdk_vmtrim = yes
-# builtin opt monet_admin = adm
-# builtin opt monet_prompt = >
-# builtin opt monet_welcome = yes
-# builtin opt monet_mod_path =
${exec_prefix}/lib/MonetDB:${exec_prefix}/lib/bin
-# builtin opt monet_daemon = yes
-# builtin opt host = localhost
-# builtin opt mapi_port = 50000
-# builtin opt mapi_noheaders = no
-# builtin opt mapi_debug = 0
-# builtin opt mapi_clients = 2
-# builtin opt sql_debug = 0
-# builtin opt sql_logdir = ${prefix}/var/MonetDB
-# builtin opt xquery_logdir = ${prefix}/var/MonetDB
-# builtin opt standoff_ns = http://monetdb.cwi.nl/standoff
-# builtin opt standoff_start = start
-# builtin opt standoff_end = end
-# config opt prefix = /ufs/niels/scratch/monetdb/Linux-x86_64
-# config opt config = ${prefix}/etc/monetdb5.conf
-# config opt prefix = /ufs/niels/scratch/monetdb/Linux-x86_64
-# config opt exec_prefix = ${prefix}
-# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
-# config opt gdk_dbname = demo
-# config opt gdk_alloc_map = no
-# config opt gdk_embedded = no
-# config opt gdk_debug = 0
-# config opt monet_mod_path =
${exec_prefix}/lib/MonetDB5:${exec_prefix}/lib/MonetDB5/lib:${exec_prefix}/lib/MonetDB5/bin
-# config opt monet_daemon = no
-# config opt monet_welcome = yes
-# config opt mero_msglog = ${prefix}/var/log/merovingian.log
-# config opt mero_errlog = ${prefix}/var/log/merovingian.log
-# config opt mero_timeinterval = 600
-# config opt mero_pidfile = ${prefix}/var/run/merovingian.pid
-# config opt mero_exittimeout = 7
-# config opt mero_doproxy = yes
-# config opt mero_discoveryttl = 600
-# config opt mal_init = ${exec_prefix}/lib/MonetDB5/mal_init.mal
-# config opt mal_listing = 2
-# config opt checkpoint_dir = ${prefix}/var/MonetDB5/chkpnt
-# config opt mapi_port = 50000
-# config opt mapi_open = false
-# config opt sql_logdir = ${prefix}/var/MonetDB5/sql_logs
-# config opt sql_init = ${exec_prefix}/lib/MonetDB5/sql_init.sql
-# cmdline opt config =
/ufs/niels/scratch/monetdb/Linux-x86_64/etc/monetdb5.conf
-# cmdline opt gdk_nr_threads = 4
-# cmdline opt monet_mod_path =
/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5/bin
-# cmdline opt gdk_dbfarm =
/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB5/dbfarm
-# cmdline opt sql_logdir =
/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB5/sql_logs
-# cmdline opt mapi_open = true
-# cmdline opt xrpc_open = true
-# cmdline opt mapi_port = 33392
-# cmdline opt xrpc_port = 40415
-# cmdline opt monet_prompt =
-# cmdline opt gdk_dbname = mTests_src_test_BugDay_2005-10-06_2.8
-# cmdline opt mal_listing = 0
-# cmdline opt gdk_debug = 10
-#warning: please don't forget to set your vault key!
-#(see /ufs/niels/scratch/monetdb/Linux-x86_64/etc/monetdb5.conf)
-
-# 19:21:06 >
-# 19:21:06 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=33392
-# 19:21:06 >
-
-MAPI = (monetdb) /var/tmp/mtest-10022/.s.monetdb.31381
-QUERY = select 'a'+1;
-ERROR = !conversion of string 'a' to type hge failed.
-CODE = 22018
-MAPI = (monetdb) /var/tmp/mtest-2179869/.s.monetdb.37655
-QUERY = select 1-'a';
-ERROR = !conversion of string 'a' to type hge failed.
-CODE = 22018
-
-# 19:21:06 >
-# 19:21:06 > Done.
-# 19:21:06 >
-
diff --git
a/sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.stable.out
b/sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.stable.out
--- a/sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.stable.out
+++ b/sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.stable.out
@@ -5,12 +5,6 @@ stdout of test 'mixed_type.SF-917372` in
# 14:04:34 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-390464" "--port=31391"
# 14:04:34 >
-#select true+1;
-% .%2 # table_name
-% %2 # name
-% bigint # type
-% 1 # length
-[ 2 ]
# 12:37:25 >
# 12:37:25 > Done.
diff --git
a/sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.stable.out.int128
b/sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.stable.out.int128
deleted file mode 100644
---
a/sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.stable.out.int128
+++ /dev/null
@@ -1,18 +0,0 @@
-stdout of test 'mixed_type.SF-917372` in directory
'sql/test/BugDay_2005-10-06_2.8` itself:
-
-
-# 14:04:34 >
-# 14:04:34 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-390464" "--port=31391"
-# 14:04:34 >
-
-#select true+1;
-% .%2 # table_name
-% %2 # name
-% hugeint # type
-% 1 # length
-[ 2 ]
-
-# 12:37:25 >
-# 12:37:25 > Done.
-# 12:37:25 >
-
diff --git a/sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.test
b/sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.test
deleted file mode 100644
--- a/sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.test
+++ /dev/null
@@ -1,12 +0,0 @@
-statement error
-select 'a'+1
-
-statement error
-select 1-'a'
-
-query I rowsort
-select true+1
-----
-2
-
-
diff --git
a/sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe.SF-1146092.stable.out
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe.SF-1146092.stable.out
---
a/sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe.SF-1146092.stable.out
+++
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe.SF-1146092.stable.out
@@ -1,9 +1,9 @@
stdout of test 'alter_table_describe.SF-1146092` in directory
'sql/test/BugDay_2005-10-06_2.9.3` itself:
-# 16:42:02 >
-# 16:42:02 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-179034" "--port=38242"
-# 16:42:02 >
+# 15:20:40 >
+# 15:20:40 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-144955" "--port=33791"
+# 15:20:40 >
#CREATE TABLE "experiment" (
# "exp_id" int PRIMARY KEY,
@@ -172,115 +172,115 @@ stdout of test 'alter_table_describe.SF-
% 10, 0, 5, 0 # length
[ "query_walk", NULL, "TABLE", NULL ]
#select * from describe_columns('sys', 'experiment');
-% .%3, .%3, .%3, .%3, .%3, .%3, .%3, .%3 # table_name
-% name, type, digits, scale, nulls, cdefault, number, remark
# name
-% clob, clob, int, int, boolean, clob, int, clob #
type
-% 9, 3, 2, 1, 5, 0, 1, 0 # length
-[ "exp_id", "int", 32, 0, false, NULL, 0, NULL ]
-[ "user_id", "int", 32, 0, true, NULL, 1, NULL ]
-[ "config_id", "int", 32, 0, true, NULL, 2, NULL ]
-[ "table_id", "int", 32, 0, true, NULL, 3, NULL ]
-[ "result_id", "int", 32, 0, true, NULL, 4, NULL ]
+% .%3, .%3, .%3, .%3, .%3, .%3, .%3, .%3, .%3 # table_name
+% name, type, digits, scale, nulls, cdefault, number,
sqltype, remark # name
+% clob, clob, int, int, boolean, clob, int, clob,
clob # type
+% 9, 3, 2, 1, 5, 0, 1, 7, 0 # length
+[ "exp_id", "int", 32, 0, false, NULL, 0, "INTEGER",
NULL ]
+[ "user_id", "int", 32, 0, true, NULL, 1, "INTEGER",
NULL ]
+[ "config_id", "int", 32, 0, true, NULL, 2, "INTEGER",
NULL ]
+[ "table_id", "int", 32, 0, true, NULL, 3, "INTEGER",
NULL ]
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
