Changeset: 993e7ae508b1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=993e7ae508b1
Added Files:
sql/jdbc/tests/Tests/bogus-auto-generated-keys.SQL.bat
sql/jdbc/tests/Tests/bogus-auto-generated-keys.SQL.sh
sql/jdbc/tests/Tests/bogus-auto-generated-keys.sql
sql/jdbc/tests/Tests/bogus-auto-generated-keys.stable.err
sql/jdbc/tests/Tests/bogus-auto-generated-keys.stable.out
Removed Files:
sql/test/Tests/bogus-auto-generated-keys.SQL.bat
sql/test/Tests/bogus-auto-generated-keys.SQL.sh
sql/test/Tests/bogus-auto-generated-keys.stable.err
sql/test/Tests/bogus-auto-generated-keys.stable.out
sql/test/bogus-auto-generated-keys.sql
Modified Files:
sql/jdbc/tests/Tests/All
sql/test/Tests/All
Branch: Nov2019
Log Message:
Move JdbcClient test bogus-auto-generated-keys to jdbc/tests/Tests/ directory
diffs (truncated from 380 to 300 lines):
diff --git a/sql/jdbc/tests/Tests/All b/sql/jdbc/tests/Tests/All
--- a/sql/jdbc/tests/Tests/All
+++ b/sql/jdbc/tests/Tests/All
@@ -11,6 +11,7 @@ HAVE_JDBCTESTS?Test_Dobjects
HAVE_JDBCTESTS?Test_FetchSize
HAVE_JDBCTESTS&HAVE_HGE?Test_Int128
HAVE_JDBCCLIENT_JAR?Test_JdbcClient
+HAVE_JDBCCLIENT_JAR?bogus-auto-generated-keys
HAVE_JDBCTESTS?Test_PSgeneratedkeys
HAVE_JDBCTESTS?Test_PSgetObject
HAVE_JDBCTESTS?Test_PSlargebatchval
diff --git a/sql/jdbc/tests/Tests/bogus-auto-generated-keys.SQL.bat
b/sql/jdbc/tests/Tests/bogus-auto-generated-keys.SQL.bat
new file mode 100755
--- /dev/null
+++ b/sql/jdbc/tests/Tests/bogus-auto-generated-keys.SQL.bat
@@ -0,0 +1,11 @@
+@echo off
+
+echo user=monetdb> .monetdb
+echo password=monetdb>> .monetdb
+
+prompt # $t $g
+echo on
+
+call java nl.cwi.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d %TSTDB%
-e -f "%TSTSRCBASE%\%TSTDIR%\Tests\bogus-auto-generated-keys.sql"
+
+@del .monetdb
diff --git a/sql/jdbc/tests/Tests/bogus-auto-generated-keys.SQL.sh
b/sql/jdbc/tests/Tests/bogus-auto-generated-keys.SQL.sh
new file mode 100755
--- /dev/null
+++ b/sql/jdbc/tests/Tests/bogus-auto-generated-keys.SQL.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+cat << EOF > .monetdb
+user=monetdb
+password=monetdb
+EOF
+
+Mlog -x "java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d
${TSTDB} -e -f \"$TSTSRCBASE/$TSTDIR/Tests/bogus-auto-generated-keys.sql\""
+
+rm -f .monetdb
diff --git a/sql/jdbc/tests/Tests/bogus-auto-generated-keys.sql
b/sql/jdbc/tests/Tests/bogus-auto-generated-keys.sql
new file mode 100644
--- /dev/null
+++ b/sql/jdbc/tests/Tests/bogus-auto-generated-keys.sql
@@ -0,0 +1,21 @@
+START TRANSACTION;
+-- generate a simple table with an auto-generated key (id)
+CREATE TABLE gen_keys (
+ "id" serial,
+ "x" varchar(12)
+);
+
+-- perform an update, useless, but illustrates the bug, this time no
+-- generated key is reported, which is correct
+UPDATE gen_keys SET "x" = 'bla' WHERE "id" = 12;
+
+-- insert some value, should get a generated key
+INSERT INTO gen_keys ("x") VALUES ('boe');
+
+-- update again, we expect NO generated key, but we DO get one
+UPDATE gen_keys SET "x" = 'bla' WHERE "id" = 1;
+UPDATE gen_keys SET "x" = 'bla' WHERE "id" = 12;
+
+-- ok, cleanup a bit
+DROP TABLE gen_keys;
+ROLLBACK;
diff --git a/sql/jdbc/tests/Tests/bogus-auto-generated-keys.stable.err
b/sql/jdbc/tests/Tests/bogus-auto-generated-keys.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/jdbc/tests/Tests/bogus-auto-generated-keys.stable.err
@@ -0,0 +1,17 @@
+stderr of test 'bogus-auto-generated-keys` in directory 'sql/jdbc/tests`
itself:
+
+
+# 19:33:44 >
+# 19:33:44 > "./bogus-auto-generated-keys.SQL.sh" "bogus-auto-generated-keys"
+# 19:33:44 >
+
+
+# 19:33:44 >
+# 19:33:44 > java nl.cwi.monetdb.client.JdbcClient -h monetdb-nuc2 -p 30491
-d mTests_sql_jdbc_tests -e -f
"/home/dinther/dev/dev/MonetDB/sql/jdbc/tests/Tests/bogus-auto-generated-keys.sql"
+# 19:33:44 >
+
+
+# 19:33:44 >
+# 19:33:44 > "Done."
+# 19:33:44 >
+
diff --git a/sql/jdbc/tests/Tests/bogus-auto-generated-keys.stable.out
b/sql/jdbc/tests/Tests/bogus-auto-generated-keys.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/jdbc/tests/Tests/bogus-auto-generated-keys.stable.out
@@ -0,0 +1,46 @@
+stdout of test 'bogus-auto-generated-keys` in directory 'sql/jdbc/tests`
itself:
+
+
+# 19:33:44 >
+# 19:33:44 > "./bogus-auto-generated-keys.SQL.sh" "bogus-auto-generated-keys"
+# 19:33:44 >
+
+
+# 19:33:44 >
+# 19:33:44 > java nl.cwi.monetdb.client.JdbcClient -h monetdb-nuc2 -p 30491
-d mTests_sql_jdbc_tests -e -f
"/home/dinther/dev/dev/MonetDB/sql/jdbc/tests/Tests/bogus-auto-generated-keys.sql"
+# 19:33:44 >
+
+START TRANSACTION;
+Operation successful
+-- generate a simple table with an auto-generated key (id)
+CREATE TABLE gen_keys (
+ "id" serial,
+ "x" varchar(12)
+);
+Operation successful
+
+-- perform an update, useless, but illustrates the bug, this time no
+-- generated key is reported, which is correct
+UPDATE gen_keys SET "x" = 'bla' WHERE "id" = 12;
+0 affected rows
+
+-- insert some value, should get a generated key
+INSERT INTO gen_keys ("x") VALUES ('boe');
+1 affected row, last generated key: 1
+
+-- update again, we expect NO generated key, but we DO get one
+UPDATE gen_keys SET "x" = 'bla' WHERE "id" = 1;
+1 affected row, last generated key: 1
+UPDATE gen_keys SET "x" = 'bla' WHERE "id" = 12;
+0 affected rows, last generated key: 1
+
+-- ok, cleanup a bit
+DROP TABLE gen_keys;
+Operation successful
+ROLLBACK;
+Operation successful
+
+# 19:33:44 >
+# 19:33:44 > "Done."
+# 19:33:44 >
+
diff --git a/sql/test/Tests/All b/sql/test/Tests/All
--- a/sql/test/Tests/All
+++ b/sql/test/Tests/All
@@ -102,8 +102,6 @@ subqueries
trace
-HAVE_JDBCCLIENT_JAR?bogus-auto-generated-keys
-
str-pad
str-trim
diff --git a/sql/test/Tests/bogus-auto-generated-keys.SQL.bat
b/sql/test/Tests/bogus-auto-generated-keys.SQL.bat
deleted file mode 100755
--- a/sql/test/Tests/bogus-auto-generated-keys.SQL.bat
+++ /dev/null
@@ -1,11 +0,0 @@
-@echo off
-
-echo user=monetdb> .monetdb
-echo password=monetdb>> .monetdb
-
-prompt # $t $g
-echo on
-
-call java nl.cwi.monetdb.client.JdbcClient -h %HOST% -p %MAPIPORT% -d %TSTDB%
-e -f "%TSTSRCBASE%\%TSTDIR%\bogus-auto-generated-keys.sql"
-
-@del .monetdb
diff --git a/sql/test/Tests/bogus-auto-generated-keys.SQL.sh
b/sql/test/Tests/bogus-auto-generated-keys.SQL.sh
deleted file mode 100755
--- a/sql/test/Tests/bogus-auto-generated-keys.SQL.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-cat << EOF > .monetdb
-user=monetdb
-password=monetdb
-EOF
-
-Mlog -x "java nl.cwi.monetdb.client.JdbcClient -h $HOST -p $MAPIPORT -d
${TSTDB} -e -f \"$TSTSRCBASE/$TSTDIR/bogus-auto-generated-keys.sql\""
-
-rm -f .monetdb
diff --git a/sql/test/Tests/bogus-auto-generated-keys.stable.err
b/sql/test/Tests/bogus-auto-generated-keys.stable.err
deleted file mode 100644
--- a/sql/test/Tests/bogus-auto-generated-keys.stable.err
+++ /dev/null
@@ -1,91 +0,0 @@
-stderr of test 'bogus-auto-generated-keys` in directory 'sql/test` itself:
-
-
-# 15:49:00 >
-# 15:49:00 > mserver5
"--config=/export/scratch/stripe/fabian/monetdb/stable/program-i86pc/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/export/scratch/stripe/fabian/monetdb/stable/program-i86pc/lib/MonetDB5:/export/scratch/stripe/fabian/monetdb/stable/program-i86pc/lib/MonetDB5/lib:/export/scratch/stripe/fabian/monetdb/stable/program-i86pc/lib/MonetDB5/bin"
--set
"gdk_dbfarm=/export/scratch/stripe/fabian/monetdb/stable/mtest-pegasus.ins.cwi.nl/sql/dbfarm"
--set
"sql_logdir=/export/scratch/stripe/fabian/monetdb/stable/mtest-pegasus.ins.cwi.nl/sql/sqllog"
--set
"xquery_logdir=/export/scratch/stripe/fabian/monetdb/stable/mtest-pegasus.ins.cwi.nl/sql/xquerylog"
--set mapi_open=true --set xrpc_open=true --set mapi_port=37335 --set
xrpc_port=46803 --set monet_prompt= --trace "--dbname=mTests_src_test" --set
mal_listing=0 "--dbinit= include sql;" ; echo ; echo Over..
-# 15:49:00 >
-
-# builtin opt gdk_arch = 64bitx86_64-pc-solaris2.11
-# builtin opt gdk_version = 1.28.1
-# builtin opt monet_pid = 29288
-# builtin opt prefix =
/export/scratch/stripe/fabian/monetdb/stable/program-i86pc
-# 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 =
/export/scratch/stripe/fabian/monetdb/stable/program-i86pc/lib/MonetDB:/export/scratch/stripe/fabian/monetdb/stable/program-i86pc/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 =
/export/scratch/stripe/fabian/monetdb/stable/program-i86pc
-# config opt config = ${prefix}/etc/monetdb5.conf
-# config opt prefix =
/export/scratch/stripe/fabian/monetdb/stable/program-i86pc
-# 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 =
/export/scratch/stripe/fabian/monetdb/stable/program-i86pc/lib/MonetDB5:/export/scratch/stripe/fabian/monetdb/stable/program-i86pc/lib/MonetDB5/lib:/export/scratch/stripe/fabian/monetdb/stable/program-i86pc/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 =
/export/scratch/stripe/fabian/monetdb/stable/program-i86pc/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 =
/export/scratch/stripe/fabian/monetdb/stable/program-i86pc/lib/MonetDB5/sql_init.sql
-# cmdline opt config =
/export/scratch/stripe/fabian/monetdb/stable/program-i86pc/etc/monetdb5.conf
-# cmdline opt gdk_nr_threads = 0
-# cmdline opt monet_mod_path =
/export/scratch/stripe/fabian/monetdb/stable/program-i86pc/lib/MonetDB5:/export/scratch/stripe/fabian/monetdb/stable/program-i86pc/lib/MonetDB5/lib:/export/scratch/stripe/fabian/monetdb/stable/program-i86pc/lib/MonetDB5/bin
-# cmdline opt gdk_dbfarm =
/export/scratch/stripe/fabian/monetdb/stable/mtest-pegasus.ins.cwi.nl/sql/dbfarm
-# cmdline opt sql_logdir =
/export/scratch/stripe/fabian/monetdb/stable/mtest-pegasus.ins.cwi.nl/sql/sqllog
-# cmdline opt xquery_logdir =
/export/scratch/stripe/fabian/monetdb/stable/mtest-pegasus.ins.cwi.nl/sql/xquerylog
-# cmdline opt mapi_open = true
-# cmdline opt xrpc_open = true
-# cmdline opt mapi_port = 37335
-# cmdline opt xrpc_port = 46803
-# cmdline opt monet_prompt =
-# cmdline opt gdk_dbname = mTests_src_test
-# cmdline opt mal_listing = 0
-#warning: please don't forget to set your vault key!
-#(see
/export/scratch/stripe/fabian/monetdb/stable/program-i86pc/etc/monetdb5.conf)
-
-# 15:49:00 >
-# 15:49:00 > ./bogus-auto-generated-keys.SQL.sh bogus-auto-generated-keys
-# 15:49:00 >
-
-
-# 15:49:00 >
-# 15:49:00 > Mtimeout -timeout 60 java nl.cwi.monetdb.client.JdbcClient -h
pegasus -p 37335 -d mTests_src_test -e -f
"../../../../../../../../../../../net/volund.ins.cwi.nl/export/scratch1/fabian/monetdb/stable/sql/src/test/Tests/../bogus-auto-generated-keys.sql"
-# 15:49:00 >
-
-
-# 15:49:01 >
-# 15:49:01 > Done.
-# 15:49:01 >
-
diff --git a/sql/test/Tests/bogus-auto-generated-keys.stable.out
b/sql/test/Tests/bogus-auto-generated-keys.stable.out
deleted file mode 100644
--- a/sql/test/Tests/bogus-auto-generated-keys.stable.out
+++ /dev/null
@@ -1,69 +0,0 @@
-stdout of test 'bogus-auto-generated-keys` in directory 'sql/test` itself:
-
-
-# 15:49:00 >
-# 15:49:00 > mserver5
"--config=/export/scratch/stripe/fabian/monetdb/stable/program-i86pc/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/export/scratch/stripe/fabian/monetdb/stable/program-i86pc/lib/MonetDB5:/export/scratch/stripe/fabian/monetdb/stable/program-i86pc/lib/MonetDB5/lib:/export/scratch/stripe/fabian/monetdb/stable/program-i86pc/lib/MonetDB5/bin"
--set
"gdk_dbfarm=/export/scratch/stripe/fabian/monetdb/stable/mtest-pegasus.ins.cwi.nl/sql/dbfarm"
--set
"sql_logdir=/export/scratch/stripe/fabian/monetdb/stable/mtest-pegasus.ins.cwi.nl/sql/sqllog"
--set
"xquery_logdir=/export/scratch/stripe/fabian/monetdb/stable/mtest-pegasus.ins.cwi.nl/sql/xquerylog"
--set mapi_open=true --set xrpc_open=true --set mapi_port=37335 --set
xrpc_port=46803 --set monet_prompt= --trace "--dbname=mTests_src_test" --set
mal_listing=0 "--dbinit= include sql;" ; echo ; echo Over..
-# 15:49:00 >
-
-# MonetDB server v5.10.1, based on kernel v1.28.1
-# Serving database 'mTests_src_test', using 1 thread
-# Compiled for x86_64-pc-solaris2.11/64bit with 64bit OIDs dynamically linked
-# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008- MonetDB B.V., all rights reserved
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://pegasus.ins.cwi.nl:37335/
-# MonetDB/SQL module v2.28.1 loaded
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
