Changeset: 2c4bbab65922 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2c4bbab65922
Modified Files:
sql/jdbc/tests/Tests/Bug_PrepStmtSetString_6382.SQL.bat
sql/jdbc/tests/Tests/Bug_PrepStmtSetString_6382.SQL.sh
sql/jdbc/tests/Tests/Test_CallableStmt.SQL.bat
sql/jdbc/tests/Tests/Test_CallableStmt.SQL.sh
sql/jdbc/tests/Tests/Test_Dobjects.SQL.sh
sql/jdbc/tests/Tests/Test_JdbcClient.stable.err
sql/jdbc/tests/Tests/Test_JdbcClient.stable.out
sql/rel.txt
Branch: default
Log Message:
Merge changes of Nov2019
diffs (182 lines):
diff --git a/sql/jdbc/tests/Tests/Bug_PrepStmtSetString_6382.SQL.bat
b/sql/jdbc/tests/Tests/Bug_PrepStmtSetString_6382.SQL.bat
--- a/sql/jdbc/tests/Tests/Bug_PrepStmtSetString_6382.SQL.bat
+++ b/sql/jdbc/tests/Tests/Bug_PrepStmtSetString_6382.SQL.bat
@@ -1,8 +1,1 @@
-@echo off
-
-set
URL=jdbc:monetdb://%HOST%:%MAPIPORT%/%TSTDB%?user=monetdb^&password=monetdb%JDBC_EXTRA_ARGS%
-
-prompt # $t $g
-echo on
-
-java %TST% "%URL%"
+@call "%TSTSRCDIR%\Test.SQL.bat" %*
diff --git a/sql/jdbc/tests/Tests/Bug_PrepStmtSetString_6382.SQL.sh
b/sql/jdbc/tests/Tests/Bug_PrepStmtSetString_6382.SQL.sh
--- a/sql/jdbc/tests/Tests/Bug_PrepStmtSetString_6382.SQL.sh
+++ b/sql/jdbc/tests/Tests/Bug_PrepStmtSetString_6382.SQL.sh
@@ -1,5 +1,3 @@
#!/bin/sh
-URL="jdbc:monetdb://${HOST}:${MAPIPORT}/${TSTDB}?user=monetdb&password=monetdb${JDBC_EXTRA_ARGS}"
-
-Mlog -x "java ${TST} \"${URL}\""
+$TSTSRCDIR/Test.SQL.sh $*
diff --git a/sql/jdbc/tests/Tests/Test_CallableStmt.SQL.bat
b/sql/jdbc/tests/Tests/Test_CallableStmt.SQL.bat
--- a/sql/jdbc/tests/Tests/Test_CallableStmt.SQL.bat
+++ b/sql/jdbc/tests/Tests/Test_CallableStmt.SQL.bat
@@ -1,8 +1,1 @@
-@echo off
-
-set
URL=jdbc:monetdb://%HOST%:%MAPIPORT%/%TSTDB%?user=monetdb^&password=monetdb%JDBC_EXTRA_ARGS%
-
-prompt # $t $g
-echo on
-
-java %TST% "%URL%"
+@call "%TSTSRCDIR%\Test.SQL.bat" %*
diff --git a/sql/jdbc/tests/Tests/Test_CallableStmt.SQL.sh
b/sql/jdbc/tests/Tests/Test_CallableStmt.SQL.sh
--- a/sql/jdbc/tests/Tests/Test_CallableStmt.SQL.sh
+++ b/sql/jdbc/tests/Tests/Test_CallableStmt.SQL.sh
@@ -1,5 +1,3 @@
#!/bin/sh
-URL="jdbc:monetdb://${HOST}:${MAPIPORT}/${TSTDB}?user=monetdb&password=monetdb${JDBC_EXTRA_ARGS}"
-
-Mlog -x "java ${TST} \"${URL}\""
+$TSTSRCDIR/Test.SQL.sh $*
diff --git a/sql/jdbc/tests/Tests/Test_Dobjects.SQL.sh
b/sql/jdbc/tests/Tests/Test_Dobjects.SQL.sh
--- a/sql/jdbc/tests/Tests/Test_Dobjects.SQL.sh
+++ b/sql/jdbc/tests/Tests/Test_Dobjects.SQL.sh
@@ -1,3 +1,3 @@
-#!/usr/bin/env bash
+#!/bin/sh
$TSTSRCDIR/Test.SQL.sh $*
diff --git a/sql/jdbc/tests/Tests/Test_JdbcClient.stable.err
b/sql/jdbc/tests/Tests/Test_JdbcClient.stable.err
--- a/sql/jdbc/tests/Tests/Test_JdbcClient.stable.err
+++ b/sql/jdbc/tests/Tests/Test_JdbcClient.stable.err
@@ -1,35 +1,55 @@
stderr of test 'Test_JdbcClient` in directory 'sql/jdbc/tests` itself:
-# 11:07:36 >
-# 11:07:36 > Mtimeout -timeout 180 Mserver
"--config=/net/pictor.ins.cwi.nl/export/scratch1/fabian/monet-current/program/etc/MonetDB.conf"
--debug=10 --set
"monet_mod_path=/net/pictor.ins.cwi.nl/export/scratch1/fabian/monet-current/program/lib/MonetDB"
--set
"gdk_dbfarm=/net/pictor.ins.cwi.nl/export/scratch1/fabian/monet-current/program/var/MonetDB/dbfarm"
--set
"sql_logdir=/net/pictor.ins.cwi.nl/export/scratch1/fabian/monet-current/program/var/MonetDB/log"
--set mapi_port=41683 --set sql_port=58545 --set monet_prompt= --trace
"--dbname=mTests_src_jdbc_tests"
"/net/pictor.ins.cwi.nl/export/scratch1/fabian/monet-current/sql/build/src/backends/monet4/sql_server.mil"
; echo ; echo Over..
-# 11:07:36 >
-
+# 18:33:45 >
+# 18:33:45 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39768" "--set"
"mapi_usock=/var/tmp/mtest-577620/.s.monetdb.39768" "--forcemito"
"--dbpath=/home/dinther/dev/dev/INSTALL/var/MonetDB/mTests_sql_jdbc_tests"
"--set" "embedded_c=true"
+# 18:33:45 >
-# 11:07:37 >
-# 11:07:37 > Mtimeout -timeout 60 ./Test_JdbcClient.SQL Test_JdbcClient
-# 11:07:37 >
+# builtin opt gdk_dbpath =
/home/dinther/dev/dev/INSTALL/var/monetdb5/dbfarm/demo
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = false
+# builtin opt mapi_ipv6 = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 39768
+# cmdline opt mapi_usock = /var/tmp/mtest-577620/.s.monetdb.39768
+# cmdline opt gdk_dbpath =
/home/dinther/dev/dev/INSTALL/var/MonetDB/mTests_sql_jdbc_tests
+# cmdline opt embedded_c = true
-
-# 11:07:37 >
-# 11:07:37 > java -jar
/net/pictor.ins.cwi.nl/export/scratch1/fabian/monet-current/sql/build/src/jdbc/MonetDB_JDBC.jar
-h pictor -p 58545 -f
../../../../..//monet-current/sql/src/jdbc/tests/Tests/../JdbcClient_create_tables.sql
-# 11:07:37 >
+# 18:33:45 >
+# 18:33:45 > "./Test_JdbcClient.SQL.sh" "Test_JdbcClient"
+# 18:33:45 >
-# 11:07:38 >
-# 11:07:38 > java -jar
/net/pictor.ins.cwi.nl/export/scratch1/fabian/monet-current/sql/build/src/jdbc/MonetDB_JDBC.jar
-h pictor -p 58545 -f
../../../../..//monet-current/sql/src/jdbc/tests/Tests/../JdbcClient_inserts_selects.sql
-# 11:07:38 >
+# 18:33:45 >
+# 18:33:45 > java nl.cwi.monetdb.client.JdbcClient -h monetdb-nuc2 -p 39768
-d mTests_sql_jdbc_tests --help
+# 18:33:45 >
+
+
+# 18:33:46 >
+# 18:33:46 > java nl.cwi.monetdb.client.JdbcClient -h monetdb-nuc2 -p 39768
-d mTests_sql_jdbc_tests -f
/home/dinther/dev/dev/MonetDB/sql/jdbc/tests/Tests/JdbcClient_create_tables.sql
+# 18:33:46 >
+
+
+# 18:33:46 >
+# 18:33:46 > java nl.cwi.monetdb.client.JdbcClient -h monetdb-nuc2 -p 39768
-d mTests_sql_jdbc_tests -f
/home/dinther/dev/dev/MonetDB/sql/jdbc/tests/Tests/JdbcClient_inserts_selects.sql
+# 18:33:46 >
-# 15:31:30 >
-# 15:31:30 > java -jar
/net/koala.ins.cwi.nl/export/scratch0/niels/Linux-x86_64/build-sql/src/jdbc/jdbcclient-1.3.jar
-h localhost -p 48076 -d
-# 15:31:30 >
+# 18:33:46 >
+# 18:33:46 > java nl.cwi.monetdb.client.JdbcClient -h monetdb-nuc2 -p 39768
-d mTests_sql_jdbc_tests -D
+# 18:33:46 >
+
-# 10:37:06 >
-# 10:37:06 > java -jar
/net/pictor.ins.cwi.nl/export/scratch1/fabian/monet-current/sql/build/src/jdbc/MonetDB_JDBC.jar
-h norma -p 50095 -d
-# 10:37:06 >
+# 18:33:47 >
+# 18:33:47 > java nl.cwi.monetdb.client.JdbcClient -h monetdb-nuc2 -p 39768
-d mTests_sql_jdbc_tests -f
/home/dinther/dev/dev/MonetDB/sql/jdbc/tests/Tests/JdbcClient_drop_tables.sql
+# 18:33:47 >
+
-# 15:31:31 >
-# 15:31:31 > Done.
-# 15:31:31 >
+# 18:33:47 >
+# 18:33:47 > "Done."
+# 18:33:47 >
diff --git a/sql/jdbc/tests/Tests/Test_JdbcClient.stable.out
b/sql/jdbc/tests/Tests/Test_JdbcClient.stable.out
--- a/sql/jdbc/tests/Tests/Test_JdbcClient.stable.out
+++ b/sql/jdbc/tests/Tests/Test_JdbcClient.stable.out
@@ -25,14 +25,10 @@ stdout of test 'Test_JdbcClient` in dire
# 18:15:40 >
-# 18:15:40 >
-# 18:15:40 > java nl.cwi.monetdb.client.JdbcClient -h catskill -p 31817 -d
mTests_sql_jdbc_tests --help
-# 18:15:40 >
-
-Usage java -jar jdbcclient.jre7.jar
+Usage java -jar jdbcclient.jre8.jar
[-h host[:port]] [-p port] [-f file] [-u user]
- [-l language] [-d database] [-e] [-D [table]]
- [-X<opt>]
+ [-l language] [-d database] [-e] [-D [table]] [-X<opt>]
+ | [--help] | [--version]
or using long option equivalents --host --port --file --user --language
--dump --echo --database.
Arguments may be written directly after the option like -p50000.
diff --git a/sql/rel.txt b/sql/rel.txt
--- a/sql/rel.txt
+++ b/sql/rel.txt
@@ -159,15 +159,15 @@ e_column
e_psm
-> flag
- psm_declare name
- type
- psm_set name
+ psm_var ->f sql_table if it is a table
+ ->tpe type of variable if not a table
+ psm_set ->l name
->l value_exp
- psm_if ->l cond_exp,
- ->r then_exp_list
+ psm_if ->l cond_exp
+ ->r then_exp_list
->f else_exp_list
psm_while ->l cond_exp
- ->r loop_exp_list
+ ->r loop_exp_list
psm_return ->l return_exp
psm_rel ->l relation
psm_exception ->l cond_exp
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
