Changeset: cbacb31e258b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cbacb31e258b
Modified Files:
sql/test/miscellaneous/Tests/simple_selects.sql
sql/test/miscellaneous/Tests/simple_selects.stable.err
testing/Mtest.py.in
Branch: linear-hashing
Log Message:
Merge with Nov2019 branch.
diffs (95 lines):
diff --git a/sql/test/miscellaneous/Tests/simple_selects.sql
b/sql/test/miscellaneous/Tests/simple_selects.sql
--- a/sql/test/miscellaneous/Tests/simple_selects.sql
+++ b/sql/test/miscellaneous/Tests/simple_selects.sql
@@ -15,7 +15,15 @@ select cast(sum(42) as bigint) having 42
select 1 having false;
select 1 having true;
-select "idontexist"."idontexist"(1); --error, it doesn;t exist
+select "idontexist"."idontexist"(); --error, it doesn't exist
+select "idontexist"."idontexist"(1); --error, it doesn't exist
+select "idontexist"."idontexist"(1,2); --error, it doesn't exist
+select "idontexist"."idontexist"(1,2,3); --error, it doesn't exist
+select "idontexist".SUM(1); --error, it doesn't exist
+select * from "idontexist"."idontexist"(); --error, it doesn't exist
+select * from "idontexist"."idontexist"(1); --error, it doesn't exist
+call "idontexist"."idontexist"(); --error, it doesn't exist
+call "idontexist"."idontexist"(1); --error, it doesn't exist
select cast(true as interval second); --error, not possible
select cast(true as interval month); --error, not possible
diff --git a/sql/test/miscellaneous/Tests/simple_selects.stable.err
b/sql/test/miscellaneous/Tests/simple_selects.stable.err
--- a/sql/test/miscellaneous/Tests/simple_selects.stable.err
+++ b/sql/test/miscellaneous/Tests/simple_selects.stable.err
@@ -5,11 +5,43 @@ stderr of test 'simple_selects` in direc
# 17:31:37 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31760" "--set"
"mapi_usock=/var/tmp/mtest-27253/.s.monetdb.31760" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/ferreira/repositories/MonetDB-Aug2018/BUILD/var/MonetDB/mTests_sql_test_miscellaneous"
"--set" "embedded_c=true"
# 17:31:37 >
-MAPI = (monetdb) /var/tmp/mtest-155342/.s.monetdb.37330
-QUERY = select "idontexist"."idontexist"(1); --error, it doesn;t exist
+MAPI = (monetdb) /var/tmp/mtest-6308/.s.monetdb.33199
+QUERY = select "idontexist"."idontexist"(); --error, it doesn't exist
+ERROR = !SELECT: no such schema 'idontexist'
+CODE = 3F000
+MAPI = (monetdb) /var/tmp/mtest-6308/.s.monetdb.33199
+QUERY = select "idontexist"."idontexist"(1); --error, it doesn't exist
+ERROR = !SELECT: no such schema 'idontexist'
+CODE = 3F000
+MAPI = (monetdb) /var/tmp/mtest-6308/.s.monetdb.33199
+QUERY = select "idontexist"."idontexist"(1,2); --error, it doesn't exist
+ERROR = !SELECT: no such schema 'idontexist'
+CODE = 3F000
+MAPI = (monetdb) /var/tmp/mtest-6308/.s.monetdb.33199
+QUERY = select "idontexist"."idontexist"(1,2,3); --error, it doesn't exist
ERROR = !SELECT: no such schema 'idontexist'
CODE = 3F000
-MAPI = (monetdb) /var/tmp/mtest-155342/.s.monetdb.37330
+MAPI = (monetdb) /var/tmp/mtest-6831/.s.monetdb.33260
+QUERY = select "idontexist".SUM(1); --error, it doesn't exist
+ERROR = !SELECT: no such schema 'idontexist'
+CODE = 3F000
+MAPI = (monetdb) /var/tmp/mtest-6831/.s.monetdb.33260
+QUERY = select * from "idontexist"."idontexist"(); --error, it doesn't exist
+ERROR = !SELECT: no such schema 'idontexist'
+CODE = 3F000
+MAPI = (monetdb) /var/tmp/mtest-6308/.s.monetdb.33199
+QUERY = select * from "idontexist"."idontexist"(1); --error, it doesn't exist
+ERROR = !SELECT: no such schema 'idontexist'
+CODE = 3F000
+MAPI = (monetdb) /var/tmp/mtest-6609/.s.monetdb.39934
+QUERY = call "idontexist"."idontexist"(); --error, it doesn't exist
+ERROR = !SELECT: no such schema 'idontexist'
+CODE = 3F000
+MAPI = (monetdb) /var/tmp/mtest-6609/.s.monetdb.39934
+QUERY = call "idontexist"."idontexist"(1); --error, it doesn't exist
+ERROR = !SELECT: no such schema 'idontexist'
+CODE = 3F000
+MAPI = (monetdb) /var/tmp/mtest-6609/.s.monetdb.39934
QUERY = select cast(true as interval second); --error, not possible
ERROR = !types boolean(1,0) and sec_interval(13,0) are not equal
CODE = 42000
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -3236,8 +3236,8 @@ def DoIt(env, SERVER, CALL, TST, EXT, Te
fp.write('\n\n! Server not ready; skipping attempt to start
client!\n\n')
ClntOut.close()
ClntErr.close()
-
- if SERVER in ["MAL", "SQL"]:
+ finally:
+ if SERVER in ["MAL", "SQL"] and pSrvr is not None:
if PSRVR is None and pSrvr.started:
pSrvr.terminate()
if procdebug:
@@ -3283,10 +3283,6 @@ def DoIt(env, SERVER, CALL, TST, EXT, Te
TestErr.write(Prompt('Done.'))
TestErr.close()
- finally:
- if PSRVR is None and pSrvr is not None and pSrvr.started:
- pSrvr.terminate()
-
if returncode is None and pSrvr is not None:
returncode = pSrvr.code # can still be None
if returncode is not None:
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
