Changeset: eeeb959bfb61 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=eeeb959bfb61
Modified Files:
sql/test/BugTracker/Tests/variables.SF-1508160.stable.err
sql/test/BugTracker/Tests/variables.SF-1508160.stable.out
sql/test/Tests/procedure_syntax.sql
sql/test/Tests/session_vars.stable.err
sql/test/Tests/session_vars.stable.out
sql/test/in-value-list/Tests/various-in-value-list-queries.sql
sql/test/mapi/Tests/sql_int128.stable.out.int128
sql/test/mergetables/Tests/part-elim.stable.out
sql/test/miscellaneous/Tests/declared_tables.stable.out
sql/test/pg_regress/Tests/horology.stable.err
Branch: scoping
Log Message:
Approved tests with changes on scoping branch
diffs (truncated from 428 to 300 lines):
diff --git a/sql/test/BugTracker/Tests/variables.SF-1508160.stable.err
b/sql/test/BugTracker/Tests/variables.SF-1508160.stable.err
--- a/sql/test/BugTracker/Tests/variables.SF-1508160.stable.err
+++ b/sql/test/BugTracker/Tests/variables.SF-1508160.stable.err
@@ -5,18 +5,17 @@ stderr of test 'variables.SF-1508160` in
# 17:12:03 > Mtimeout -timeout 180 Mserver
"--config=/ufs/niels/scratch/rc/Linux-x86_64/etc/MonetDB.conf" --debug=10 --set
"monet_mod_path=/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB:/ufs/niels/scratch/rc/Linux-x86_64/lib/bin"
--set "gdk_dbfarm=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB/dbfarm" --set
"sql_logdir=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB/log" --set
mapi_port=38749 --set monet_prompt= --trace
"--dbname=mTests_src_test_BugTracker" --dbinit="module(sql_server);
sql_server_start();" ; echo ; echo Over..
# 17:12:03 >
-
-# 17:12:03 >
-# 17:12:03 > Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb
--host=localhost --port=38749 < variables.SF-1508160.sql
-# 17:12:03 >
-
-MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
+MAPI = (monetdb) /var/tmp/mtest-272580/.s.monetdb.34031
+QUERY = select @debug;
+ERROR = !syntax error, unexpected AT in: "select @"
+CODE = 42000
+MAPI = (monetdb) /var/tmp/mtest-272580/.s.monetdb.34031
QUERY = select explain;
ERROR = !SELECT: identifier 'explain' unknown
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
QUERY = select @explain;
-ERROR = !SELECT: '@explain' unknown
+ERROR = !syntax error, unexpected AT in: "select @"
CODE = 42000
# 17:12:03 >
diff --git a/sql/test/BugTracker/Tests/variables.SF-1508160.stable.out
b/sql/test/BugTracker/Tests/variables.SF-1508160.stable.out
--- a/sql/test/BugTracker/Tests/variables.SF-1508160.stable.out
+++ b/sql/test/BugTracker/Tests/variables.SF-1508160.stable.out
@@ -19,12 +19,6 @@ stdout of test 'variables.SF-1508160` in
% int # type
% 1 # length
[ 0 ]
-#select @debug;
-% . # table_name
-% single_value # name
-% int # type
-% 1 # length
-[ 0 ]
# 10:42:20 >
# 10:42:20 > Done.
diff --git a/sql/test/Tests/procedure_syntax.sql
b/sql/test/Tests/procedure_syntax.sql
--- a/sql/test/Tests/procedure_syntax.sql
+++ b/sql/test/Tests/procedure_syntax.sql
@@ -19,8 +19,8 @@ END;
create PROCEDURE p3(id int, name varchar(1024))
BEGIN
- declare id int;
- set id = 0;
+ declare id2 int;
+ set id2 = 0;
END;
select name from functions where name = 'p1' or name = 'p2' or name = 'p3';
diff --git a/sql/test/Tests/session_vars.stable.err
b/sql/test/Tests/session_vars.stable.err
--- a/sql/test/Tests/session_vars.stable.err
+++ b/sql/test/Tests/session_vars.stable.err
@@ -5,103 +5,41 @@ stderr of test 'session_vars` in directo
# 20:30:42 > 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=39627 --set
xrpc_port=43642 --set monet_prompt= --trace "--dbname=mTests_src_test" --set
mal_listing=0 "--dbinit= include sql;" ; echo ; echo Over..
# 20:30:42 >
-# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
-# builtin opt gdk_version = 1.27.0
-# builtin opt monet_pid = 24230
-# 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 = 39627
-# cmdline opt xrpc_port = 43642
-# cmdline opt monet_prompt =
-# cmdline opt gdk_dbname = mTests_src_test
-# 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)
-
-# 20:30:42 >
-# 20:30:42 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=39627
-# 20:30:42 >
-
-MAPI = (monetdb) /var/tmp/mtest-222303/.s.monetdb.38750
+MAPI = (monetdb) /var/tmp/mtest-272580/.s.monetdb.34031
+QUERY = select @debug;
+ERROR = !syntax error, unexpected AT in: "select @"
+CODE = 42000
+MAPI = (monetdb) /var/tmp/mtest-272580/.s.monetdb.34031
+QUERY = select @current_schema;
+ERROR = !syntax error, unexpected AT in: "select @"
+CODE = 42000
+MAPI = (monetdb) /var/tmp/mtest-272580/.s.monetdb.34031
+QUERY = select @"current_user";
+ERROR = !syntax error, unexpected AT in: "select @"
+CODE = 42000
+MAPI = (monetdb) /var/tmp/mtest-272580/.s.monetdb.34031
+QUERY = select @"current_role";
+ERROR = !syntax error, unexpected AT in: "select @"
+CODE = 42000
+MAPI = (monetdb) /var/tmp/mtest-272580/.s.monetdb.34031
QUERY = set test_nr = 'help'; --error, conversion failed
ERROR = !conversion of string 'help' to type int failed.
CODE = 22018
-MAPI = (monetdb) /var/tmp/mtest-222303/.s.monetdb.38750
-QUERY = set test_str = 1; --error, variable no longer in cache
-ERROR = !Variable test_str unknown
-CODE = 42000
-MAPI = (monetdb) /var/tmp/mtest-222303/.s.monetdb.38750
+MAPI = (monetdb) /var/tmp/mtest-272580/.s.monetdb.34031
QUERY = set test_boolean = 'help'; --error, variable no longer in cache
-ERROR = !Variable test_boolean unknown
-CODE = 42000
-MAPI = (monetdb) /var/tmp/mtest-222303/.s.monetdb.38750
+ERROR = !conversion of string 'help' to type bit failed.
+CODE = 22018
+MAPI = (monetdb) /var/tmp/mtest-272580/.s.monetdb.34031
QUERY = select @test_nr; --error, variable no longer in cache
-ERROR = !SELECT: '@test_nr' unknown
+ERROR = !syntax error, unexpected AT in: "select @"
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-222303/.s.monetdb.38750
QUERY = select @test_str; --error, variable no longer in cache
-ERROR = !SELECT: '@test_str' unknown
+ERROR = !syntax error, unexpected AT in: "select @"
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-222303/.s.monetdb.38750
QUERY = select @test_boolean; --error, variable no longer in cache
-ERROR = !SELECT: '@test_boolean' unknown
+ERROR = !syntax error, unexpected AT in: "select @"
CODE = 42000
# 20:30:43 >
diff --git a/sql/test/Tests/session_vars.stable.out
b/sql/test/Tests/session_vars.stable.out
--- a/sql/test/Tests/session_vars.stable.out
+++ b/sql/test/Tests/session_vars.stable.out
@@ -80,30 +80,7 @@ stdout of test 'session_vars` in directo
% boolean # type
% 5 # length
[ true ]
-#select @debug;
-% . # table_name
-% single_value # name
-% int # type
-% 1 # length
-[ 0 ]
-#select @current_schema;
-% . # table_name
-% single_value # name
-% varchar # type
-% 3 # length
-[ "sys" ]
-#select @"current_user";
-% . # table_name
-% single_value # name
-% varchar # type
-% 7 # length
-[ "monetdb" ]
-#select @"current_role";
-% . # table_name
-% single_value # name
-% varchar # type
-% 7 # length
-[ "monetdb" ]
+#set test_str = 1; --error, variable no longer in cache
# 12:30:00 >
# 12:30:00 > Done.
diff --git a/sql/test/in-value-list/Tests/various-in-value-list-queries.sql
b/sql/test/in-value-list/Tests/various-in-value-list-queries.sql
--- a/sql/test/in-value-list/Tests/various-in-value-list-queries.sql
+++ b/sql/test/in-value-list/Tests/various-in-value-list-queries.sql
@@ -1,4 +1,4 @@
-create table foo (i int);
+ qcreate table foo (i int);
insert into foo values (null), (10), (null), (20), (10), (30), (30), (30),
(50), (40), (50);
select * from foo where i in (10, 20, 20, 30, 30) order by i;
diff --git a/sql/test/mapi/Tests/sql_int128.stable.out.int128
b/sql/test/mapi/Tests/sql_int128.stable.out.int128
--- a/sql/test/mapi/Tests/sql_int128.stable.out.int128
+++ b/sql/test/mapi/Tests/sql_int128.stable.out.int128
@@ -61,7 +61,7 @@ stdout of test 'sql_int128` in directory
function user.s4_0():void;
X_2:void := querylog.define("explain set a = 1234567890987654321;":str,
"default_pipe":str, 8:int);
X_5:int := sql.mvc();
- sql.setVariable(X_5:int, "a":str, 1234567890987654321:hge);
+ sql.setVariable(X_5:int, "sys":str, "a":str, 1234567890987654321:hge);
sql.exportOperation();
end user.s4_0;
#inline actions= 0 time=0 usec
@@ -98,7 +98,7 @@ end user.s4_0;
function user.s6_0():void;
X_2:void := querylog.define("explain set b = 10000000000;":str,
"default_pipe":str, 8:int);
X_5:int := sql.mvc();
- sql.setVariable(X_5:int, "b":str, 10000000000:hge);
+ sql.setVariable(X_5:int, "sys":str, "b":str, 10000000000:hge);
sql.exportOperation();
end user.s6_0;
#inline actions= 0 time=1 usec
@@ -135,10 +135,10 @@ end user.s6_0;
function user.s8_0():void;
X_1:void := querylog.define("explain set c = a * b;":str,
"default_pipe":str, 9:int);
X_4:int := sql.mvc();
- X_5:hge := sql.getVariable(X_4:int, "a":str);
- X_7:hge := sql.getVariable(X_4:int, "b":str);
- X_9:hge := calc.*(X_5:hge, X_7:hge);
- sql.setVariable(X_4:int, "c":str, X_9:hge);
+ X_5:hge := sql.getVariable(X_4:int, "sys":str, "a":str);
+ X_8:hge := sql.getVariable(X_4:int, "sys":str, "b":str);
+ X_10:hge := calc.*(X_5:hge, X_8:hge);
+ sql.setVariable(X_4:int, "sys":str, "c":str, X_10:hge);
sql.exportOperation();
end user.s8_0;
#inline actions= 0 time=0 usec
@@ -175,10 +175,10 @@ end user.s8_0;
function user.s10_0():void;
X_1:void := querylog.define("explain set d = c * b;":str,
"default_pipe":str, 9:int);
X_4:int := sql.mvc();
- X_5:hge := sql.getVariable(X_4:int, "c":str);
- X_7:hge := sql.getVariable(X_4:int, "b":str);
- X_9:hge := calc.*(X_5:hge, X_7:hge);
- sql.setVariable(X_4:int, "d":str, X_9:hge);
+ X_5:hge := sql.getVariable(X_4:int, "sys":str, "c":str);
+ X_8:hge := sql.getVariable(X_4:int, "sys":str, "b":str);
+ X_10:hge := calc.*(X_5:hge, X_8:hge);
+ sql.setVariable(X_4:int, "sys":str, "d":str, X_10:hge);
sql.exportOperation();
end user.s10_0;
#inline actions= 0 time=1 usec
@@ -215,10 +215,10 @@ end user.s10_0;
function user.s12_0():void;
X_1:void := querylog.define("explain set e = d + a;":str,
"default_pipe":str, 9:int);
X_4:int := sql.mvc();
- X_5:hge := sql.getVariable(X_4:int, "d":str);
- X_7:hge := sql.getVariable(X_4:int, "a":str);
- X_9:hge := calc.+(X_5:hge, X_7:hge);
- sql.setVariable(X_4:int, "e":str, X_9:hge);
+ X_5:hge := sql.getVariable(X_4:int, "sys":str, "d":str);
+ X_8:hge := sql.getVariable(X_4:int, "sys":str, "a":str);
+ X_10:hge := calc.+(X_5:hge, X_8:hge);
+ sql.setVariable(X_4:int, "sys":str, "e":str, X_10:hge);
sql.exportOperation();
end user.s12_0;
#inline actions= 0 time=0 usec
diff --git a/sql/test/mergetables/Tests/part-elim.stable.out
b/sql/test/mergetables/Tests/part-elim.stable.out
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
