Changeset: 8ec561935af5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8ec561935af5
Added Files:
sql/test/BugTracker/Tests/drop_schema_crash.SF-1504794.sql
sql/test/BugTracker/Tests/drop_schema_crash.SF-1504794.test
sql/test/BugTracker/Tests/explain.SF-1739353.sql
sql/test/BugTracker/Tests/explain.SF-1739353.test
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.sql
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.test
Removed Files:
sql/test/BugTracker/Tests/drop_schema_crash.SF-1504794-data.sql
sql/test/BugTracker/Tests/drop_schema_crash.SF-1504794.SQL.bat
sql/test/BugTracker/Tests/drop_schema_crash.SF-1504794.SQL.sh
sql/test/BugTracker/Tests/explain.SF-1739353-data.sql
sql/test/BugTracker/Tests/explain.SF-1739353.SQL.bat
sql/test/BugTracker/Tests/explain.SF-1739353.SQL.sh
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356-data.sql
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.SQL.bat
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.SQL.sh
Modified Files:
sql/test/BugTracker/Tests/All
sql/test/BugTracker/Tests/drop_schema_crash.SF-1504794.stable.err
sql/test/BugTracker/Tests/drop_schema_crash.SF-1504794.stable.out
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.err
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
Branch: mtest
Log Message:
These tests don't require JDBC client
diffs (truncated from 825 to 300 lines):
diff --git a/sql/test/BugTracker/Tests/All b/sql/test/BugTracker/Tests/All
--- a/sql/test/BugTracker/Tests/All
+++ b/sql/test/BugTracker/Tests/All
@@ -20,7 +20,7 @@ HAVE_JDBCCLIENT_JAR?authorization.SF-143
HAVE_PYMONETDB?mapi_connect_errors_vanish.SF-1432134
create_column_name_data.SF-1440214
connect_crash.SF-1436626
-HAVE_JDBCCLIENT_JAR?drop_schema_crash.SF-1504794
+drop_schema_crash.SF-1504794
set_session_vars.SF-1505987
reset_session_vars.SF-1505987
cast_interval2time.SF-1488247
@@ -75,11 +75,11 @@ update_pkey_bug.SF-1733712
update_fkey_with_value_not_in_the_pkey.SF-1734143
alter_table_add_fkey.SF-1737668
select_id_not_in_another_select.SF-1737777
-HAVE_JDBCCLIENT_JAR?explain.SF-1739353
+explain.SF-1739353
limit_timestampz.SF-1774217
convert_dec2varchar.SF-1774312
convert_dec2varchar_crash.SF-1775550
-HAVE_JDBCCLIENT_JAR?jdbc_no_debug.SF-1739356
+jdbc_no_debug.SF-1739356
cascade_operations_in_different_sessions.SF-1823387_create
cascade_operations_in_different_sessions.SF-1823387_drop
number_null_first_row.SF-1833286
diff --git a/sql/test/BugTracker/Tests/drop_schema_crash.SF-1504794.SQL.bat
b/sql/test/BugTracker/Tests/drop_schema_crash.SF-1504794.SQL.bat
deleted file mode 100755
--- a/sql/test/BugTracker/Tests/drop_schema_crash.SF-1504794.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%
-f "%RELSRCDIR%\drop_schema_crash.SF-1504794-data.sql"
-
-@del .monetdb
diff --git a/sql/test/BugTracker/Tests/drop_schema_crash.SF-1504794.SQL.sh
b/sql/test/BugTracker/Tests/drop_schema_crash.SF-1504794.SQL.sh
deleted file mode 100755
--- a/sql/test/BugTracker/Tests/drop_schema_crash.SF-1504794.SQL.sh
+++ /dev/null
@@ -1,8 +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} -f \"$RELSRCDIR/drop_schema_crash.SF-1504794-data.sql\""
diff --git a/sql/test/BugTracker/Tests/drop_schema_crash.SF-1504794-data.sql
b/sql/test/BugTracker/Tests/drop_schema_crash.SF-1504794.sql
rename from sql/test/BugTracker/Tests/drop_schema_crash.SF-1504794-data.sql
rename to sql/test/BugTracker/Tests/drop_schema_crash.SF-1504794.sql
diff --git a/sql/test/BugTracker/Tests/drop_schema_crash.SF-1504794.stable.err
b/sql/test/BugTracker/Tests/drop_schema_crash.SF-1504794.stable.err
--- a/sql/test/BugTracker/Tests/drop_schema_crash.SF-1504794.stable.err
+++ b/sql/test/BugTracker/Tests/drop_schema_crash.SF-1504794.stable.err
@@ -1,92 +1,16 @@
stderr of test 'drop_schema_crash.SF-1504794` in directory
'sql/test/BugTracker` itself:
-# 03:52:02 >
-# 03:52:02 > mserver5
"--config=/scratch/monet.GNU.64.64.d.1.26814/MonetDB5/.GNU.64.64.d.1-Fedora10/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=4 --set
"monet_mod_path=/scratch/monet.GNU.64.64.d.1.26814/sql/Fedora10/src/backends/monet5/.libs:/scratch/monet.GNU.64.64.d.1.26814/sql/Fedora10/src/backends/monet5:/scratch/monet.GNU.64.64.d.1.26814/MonetDB5/.GNU.64.64.d.1-Fedora10/lib64/MonetDB5:/scratch/monet.GNU.64.64.d.1.26814/MonetDB5/.GNU.64.64.d.1-Fedora10/lib64/MonetDB5/lib:/scratch/monet.GNU.64.64.d.1.26814/MonetDB5/.GNU.64.64.d.1-Fedora10/lib64/MonetDB5/bin"
--set "gdk_dbfarm=/scratch/monet.GNU.64.64.d.1.26814/sql/Fedora10/dbfarm"
--set mapi_open=true --set xrpc_open=true --set mapi_port=39034 --set
xrpc_port=40230 --set monet_prompt= --trace
"--dbname=mTests_src_test_BugTracker" --set mal_listing=0 "--dbinit= include
sql;" ; echo ; echo Over..
-# 03:52:02 >
+# 15:07:44 >
+# 15:07:44 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-313380" "--port=33127"
+# 15:07:44 >
-# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
-# builtin opt gdk_version = 1.36.0
-# builtin opt prefix =
/scratch/monet.GNU.64.64.d.1.26814/MonetDB/.GNU.64.64.d.1-Fedora10
-# 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_alloc_map = yes
-# builtin opt gdk_vmtrim = yes
-# builtin opt monet_admin = adm
-# builtin opt monet_prompt = >
-# builtin opt monet_welcome = yes
-# builtin opt monet_mod_path = ${prefix}/lib64/MonetDB
-# 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 standoff_ns = http://monetdb.cwi.nl/standoff
-# builtin opt standoff_start = start
-# builtin opt standoff_end = end
-# config opt prefix =
/scratch/monet.GNU.64.64.d.1.26814/MonetDB5/.GNU.64.64.d.1-Fedora10
-# config opt config = ${prefix}/etc/monetdb5.conf
-# config opt prefix =
/scratch/monet.GNU.64.64.d.1.26814/MonetDB5/.GNU.64.64.d.1-Fedora10
-# 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 =
${prefix}/lib64/MonetDB5:${prefix}/lib64/MonetDB5/lib:${prefix}/lib64/MonetDB5/bin
-# config opt monet_daemon = no
-# config opt monet_welcome = yes
-# config opt mero_msglog = ${prefix}/var/log/MonetDB/merovingian.log
-# config opt mero_errlog = ${prefix}/var/log/MonetDB/merovingian.log
-# config opt mero_pidfile = ${prefix}/var/run/MonetDB/merovingian.pid
-# config opt mero_controlport = 50001
-# config opt mal_init = ${prefix}/lib64/MonetDB5/mal_init.mal
-# config opt mal_listing = 2
-# config opt mapi_port = 50000
-# config opt mapi_autosense = false
-# config opt mapi_open = false
-# config opt sql_optimizer = mitosis_pipe
-# config opt default_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,garbageCollector,dataflow,history,multiplex
-# config opt replication_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,garbageCollector,dataflow,history,replication,multiplex
-# config opt accumulator_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,accumulators,garbageCollector,dataflow,history,multiplex
-# config opt recycler_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,deadcode,recycle,reduce,garbageCollector,dataflow,history,multiplex
-# config opt cracker_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,selcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,garbageCollector,dataflow,history,multiplex
-# config opt sidcrack_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,sidcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,garbageCollector,dataflow,history,multiplex
-# config opt octopus_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,constants,commonTerms,joinPath,octopus,deadcode,reduce,garbageCollector,dataflow,history,multiplex
-# config opt mitosis_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,garbageCollector,dataflow,history,multiplex
-# config opt datacyclotron_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,datacyclotron,mergetable,deadcode,constants,commonTerms,joinPath,reorder,deadcode,reduce,garbageCollector,dataflow,history,replication,multiplex
-# config opt derive_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,derivePath,joinPath,deadcode,reduce,garbageCollector,dataflow,history,multiplex
-# config opt dictionary_pipe =
inline,remap,dictionary,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,garbageCollector,dataflow,history,multiplex
-# cmdline opt config =
/scratch/monet.GNU.64.64.d.1.26814/MonetDB5/.GNU.64.64.d.1-Fedora10/etc/monetdb5.conf
-# cmdline opt gdk_nr_threads = 4
-# cmdline opt monet_mod_path =
/scratch/monet.GNU.64.64.d.1.26814/sql/Fedora10/src/backends/monet5/.libs:/scratch/monet.GNU.64.64.d.1.26814/sql/Fedora10/src/backends/monet5:/scratch/monet.GNU.64.64.d.1.26814/MonetDB5/.GNU.64.64.d.1-Fedora10/lib64/MonetDB5:/scratch/monet.GNU.64.64.d.1.26814/MonetDB5/.GNU.64.64.d.1-Fedora10/lib64/MonetDB5/lib:/scratch/monet.GNU.64.64.d.1.26814/MonetDB5/.GNU.64.64.d.1-Fedora10/lib64/MonetDB5/bin
-# cmdline opt gdk_dbfarm =
/scratch/monet.GNU.64.64.d.1.26814/sql/Fedora10/dbfarm
-# cmdline opt mapi_open = true
-# cmdline opt xrpc_open = true
-# cmdline opt mapi_port = 39034
-# cmdline opt xrpc_port = 40230
-# cmdline opt monet_prompt =
-# cmdline opt gdk_dbname = mTests_src_test_BugTracker
-# cmdline opt mal_listing = 0
-#warning: please don't forget to set your vault key!
-#(see
/scratch/monet.GNU.64.64.d.1.26814/MonetDB5/.GNU.64.64.d.1-Fedora10/etc/monetdb5.conf)
+MAPI = (monetdb) /var/tmp/mtest-313380/.s.monetdb.33127
+QUERY = DROP SCHEMA "dbtapestry";
+ERROR = !DROP SCHEMA: unable to drop schema 'dbtapestry' (there are database
objects which depend on it)
+CODE = 2BM37
-# 03:52:03 >
-# 03:52:03 > ./drop_schema_crash.SF-1504794.SQL.sh
drop_schema_crash.SF-1504794
-# 03:52:03 >
-
+# 15:07:44 >
+# 15:07:44 > "Done."
+# 15:07:44 >
-# 03:52:03 >
-# 03:52:03 > Mtimeout -timeout 60 java nl.cwi.monetdb.client.JdbcClient -h
beo-13 -p 39034 -d mTests_src_test_BugTracker -f
"../../../../../../sql/src/test/BugTracker/Tests/drop_schema_crash.SF-1504794-data.sql"
-# 03:52:03 >
-
-Error on line 5: [2BM37] DROP SCHEMA: unable to drop schema 'dbtapestry'
(there are database objects which depend on it)
-
-# 03:52:03 >
-# 03:52:03 > Done.
-# 03:52:03 >
-
diff --git a/sql/test/BugTracker/Tests/drop_schema_crash.SF-1504794.stable.out
b/sql/test/BugTracker/Tests/drop_schema_crash.SF-1504794.stable.out
--- a/sql/test/BugTracker/Tests/drop_schema_crash.SF-1504794.stable.out
+++ b/sql/test/BugTracker/Tests/drop_schema_crash.SF-1504794.stable.out
@@ -1,43 +1,24 @@
stdout of test 'drop_schema_crash.SF-1504794` in directory
'sql/test/BugTracker` itself:
-# 15:45:34 >
-# 15:45:34 > Mtimeout -timeout 300 mserver5
"--config=/ufs/goncalve/scratch/MonetDB/monetdb5/etc/MonetDB5.conf" --debug=10
--set
"monet_mod_path=/ufs/goncalve/scratch/MonetDB/monetdb5/lib/MonetDB5:/ufs/goncalve/scratch/MonetDB/monetdb5/lib/MonetDB5/lib:/ufs/goncalve/scratch/MonetDB/monetdb5/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/goncalve/scratch/MonetDB/monetdb5/var/MonetDB5/dbfarm"
--set "sql_logdir=/ufs/goncalve/scratch/MonetDB/monetdb5/var/MonetDB5/sql_logs"
--set
"sql_logdir=/ufs/goncalve/scratch/MonetDB/monetdb5/var/MonetDB5/xquery_logs"
--set mapi_port=33849 --set monet_prompt= --trace
"--dbname=mTests_src_test_BugTracker" --dbinit='include sql;' ; echo ; echo
Over..
-# 15:45:34 >
-
-# MonetDB Server v4.99.19
-# Copyright (c) 1993-2006 CWI, all rights reserved
-# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs dynamically linked
-# config:/ufs/goncalve/scratch/MonetDB/monetdb5/etc/MonetDB5.conf
-# dbfarm:/ufs/goncalve/scratch/MonetDB/monetdb5/var/MonetDB5/dbfarm
-# dbname:mTests_src_test_BugTracker
-# Visit http://monetdb.cwi.nl/ for further information
-
-
-
-# 11:12:03 >
-# 11:12:03 > Mtimeout -timeout 180 ./drop_schema_crash.SF-1504794.SQL
drop_schema_crash.SF-1504794
-# 11:12:03 >
-
+# 15:07:44 >
+# 15:07:44 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-313380" "--port=33127"
+# 15:07:44 >
-# 11:12:03 >
-# 11:12:03 > Mtimeout -timeout 60 java -jar
/net/koala.ins.cwi.nl/export/scratch0/niels/rc/Linux-x86_64/build-sql/src/jdbc/jdbcclient-1.4.jar
-h localhost -p 35369 -d mTests_src_test_BugTracker -f
../../../../../../../..//scratch1/niels/rc/sql/src/test/BugTracker/Tests/drop_schema_crash.SF-1504794-data.sql
-# 11:12:03 >
-
-Operation successful
-
-Operation successful
-
-Operation successful
+#CREATE USER "dbtapestry" WITH PASSWORD 'dbtapestry' NAME 'DB Tapestry' SCHEMA
"sys";
+#CREATE SCHEMA "dbtapestry" AUTHORIZATION "dbtapestry";
+#ALTER USER "dbtapestry" SET SCHEMA "dbtapestry";
+#SELECT "users"."name", "schemas"."name"
+# FROM "users" LEFT JOIN "schemas"
+# ON "users"."default_schema" = "schemas"."id"
+# WHERE "users"."name" LIKE 'dbtapestry';
+% .users, .schemas # table_name
+% name, name # name
+% varchar, varchar # type
+% 10, 10 # length
+[ "dbtapestry", "dbtapestry" ]
-+------------+------------+
-| name | name |
-+============+============+
-| dbtapestry | dbtapestry |
-+------------+------------+
-1 row
+# 15:07:44 >
+# 15:07:44 > "Done."
+# 15:07:44 >
-# 11:12:03 >
-# 11:12:03 > Done.
-# 11:12:03 >
-
diff --git a/sql/test/BugTracker/Tests/drop_schema_crash.SF-1504794.test
b/sql/test/BugTracker/Tests/drop_schema_crash.SF-1504794.test
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker/Tests/drop_schema_crash.SF-1504794.test
@@ -0,0 +1,22 @@
+statement ok
+CREATE USER "dbtapestry" WITH PASSWORD 'dbtapestry' NAME 'DB Tapestry' SCHEMA
"sys"
+
+statement ok
+CREATE SCHEMA "dbtapestry" AUTHORIZATION "dbtapestry"
+
+statement ok
+ALTER USER "dbtapestry" SET SCHEMA "dbtapestry"
+
+statement error
+DROP SCHEMA "dbtapestry"
+
+query TT rowsort
+SELECT "users"."name", "schemas"."name"
+ FROM "users" LEFT JOIN "schemas"
+ ON "users"."default_schema" = "schemas"."id"
+ WHERE "users"."name" LIKE 'dbtapestry'
+----
+dbtapestry
+dbtapestry
+
+
diff --git a/sql/test/BugTracker/Tests/explain.SF-1739353.SQL.bat
b/sql/test/BugTracker/Tests/explain.SF-1739353.SQL.bat
deleted file mode 100755
--- a/sql/test/BugTracker/Tests/explain.SF-1739353.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%
-f "%RELSRCDIR%\explain.SF-1739353-data.sql"
-
-@del .monetdb
diff --git a/sql/test/BugTracker/Tests/explain.SF-1739353.SQL.sh
b/sql/test/BugTracker/Tests/explain.SF-1739353.SQL.sh
deleted file mode 100755
--- a/sql/test/BugTracker/Tests/explain.SF-1739353.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} -f \"$RELSRCDIR/explain.SF-1739353-data.sql\""
-
-rm -f .monetdb
diff --git a/sql/test/BugTracker/Tests/explain.SF-1739353-data.sql
b/sql/test/BugTracker/Tests/explain.SF-1739353.sql
rename from sql/test/BugTracker/Tests/explain.SF-1739353-data.sql
rename to sql/test/BugTracker/Tests/explain.SF-1739353.sql
diff --git a/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
b/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
--- a/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
+++ b/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
@@ -1,92 +1,73 @@
stdout of test 'explain.SF-1739353` in directory 'sql/test/BugTracker` itself:
-# 15:11:17 >
-# 15:11:17 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33800" "--set"
"mapi_usock=/var/tmp/mtest-7180/.s.monetdb.33800" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/ufs/sjoerd/@Monet-virgin/var/MonetDB/mTests_sql_test_BugTracker"
-# 15:11:17 >
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
