Changeset: 7f7f696f819e for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7f7f696f819e Added Files: sql/test/prepare/Tests/prepare_commit_execute.SF-2606020.SQL.py sql/test/prepare/Tests/prepare_commit_execute.SF-2606020.sql sql/test/prepare/Tests/prepare_commit_execute.SF-2606020.stable.err sql/test/prepare/Tests/prepare_commit_execute.SF-2606020.stable.out sql/test/prepare/Tests/prepare_decimal_bug.SF-2831994.SQL.py sql/test/prepare/Tests/prepare_decimal_bug.SF-2831994.sql sql/test/prepare/Tests/prepare_decimal_bug.SF-2831994.stable.err sql/test/prepare/Tests/prepare_decimal_bug.SF-2831994.stable.out Removed Files: sql/test/BugTracker-2009/Tests/prepare_commit_execute.SF-2606020.sql sql/test/BugTracker-2009/Tests/prepare_commit_execute.SF-2606020.stable.err sql/test/BugTracker-2009/Tests/prepare_commit_execute.SF-2606020.stable.out sql/test/BugTracker-2009/Tests/prepare_commit_execute.SF-2606020.test sql/test/BugTracker-2009/Tests/prepare_decimal_bug.SF-2831994.sql sql/test/BugTracker-2009/Tests/prepare_decimal_bug.SF-2831994.stable.err sql/test/BugTracker-2009/Tests/prepare_decimal_bug.SF-2831994.stable.out sql/test/BugTracker-2009/Tests/prepare_decimal_bug.SF-2831994.test Modified Files: sql/test/BugTracker-2009/Tests/All sql/test/prepare/Tests/All Branch: mtest Log Message:
couple more prepare stmt tests moved from sql/test/BugTracker-2009/ diffs (truncated from 630 to 300 lines): diff --git a/sql/test/BugTracker-2009/Tests/All b/sql/test/BugTracker-2009/Tests/All --- a/sql/test/BugTracker-2009/Tests/All +++ b/sql/test/BugTracker-2009/Tests/All @@ -70,7 +70,6 @@ reorder.SF-2770608 orIssue.SF-2812504 recursion-problem.SF-2827784 select_X_where_bla_EQ_whatever.SF-282597 -prepare_decimal_bug.SF-2831994 rollback_mistake.SF-2814622 numeric_data_type_bug.SF-2818176 insert_into_values_bug.SF-2807609 @@ -78,7 +77,6 @@ set_and_arg_null.SF-2812729 pow_operator.SF-2812721 count_distinct_bug.SF-2826015 assert_in_update.SF-2807336 -prepare_commit_execute.SF-2606020 ambiguous_order_by.SF-2827916 except_error_wrong.SF-2808409 Floating_point_exception.SF-2791356 diff --git a/sql/test/BugTracker-2009/Tests/prepare_commit_execute.SF-2606020.sql b/sql/test/BugTracker-2009/Tests/prepare_commit_execute.SF-2606020.sql deleted file mode 100644 --- a/sql/test/BugTracker-2009/Tests/prepare_commit_execute.SF-2606020.sql +++ /dev/null @@ -1,13 +0,0 @@ -start transaction; -create table pce (i int, s string); -commit; -start transaction; -prepare insert into pce (i,s) values (?,?); -exec **(1,'test 1'); -select * from pce; -commit; -start transaction; -exec **(2,'test 2'); -select * from pce; -commit; -drop table pce; diff --git a/sql/test/BugTracker-2009/Tests/prepare_commit_execute.SF-2606020.stable.err b/sql/test/BugTracker-2009/Tests/prepare_commit_execute.SF-2606020.stable.err deleted file mode 100644 --- a/sql/test/BugTracker-2009/Tests/prepare_commit_execute.SF-2606020.stable.err +++ /dev/null @@ -1,76 +0,0 @@ -stderr of test 'prepare_commit_execute.SF-2606020` in directory 'sql/test/BugTracker-2009` itself: - - -# 15:00:13 > -# 15:00:13 > mserver5 "--config=/ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf" --debug=10 --set gdk_nr_threads=0 --set "monet_mod_path=/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/bin" --set "gdk_dbfarm=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/dbfarm" --set mapi_open=true --set xrpc_open=true --set mapi_port=30796 --set xrpc_port=41543 --set monet_prompt= --trace "--dbname=mTests_src_test_BugTracker-2009" --set mal_listing=0 "--dbinit= include sql;" ; echo ; echo Over.. -# 15:00:13 > - -# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu -# builtin opt gdk_version = 1.32.0 -# builtin opt prefix = /ufs/niels/scratch/rc/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_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 = ${exec_prefix}/lib/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 sql_logdir = sql_logs -# builtin opt xquery_logdir = xquery_logs -# 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/rc/Linux-x86_64 -# config opt config = ${prefix}/etc/monetdb5.conf -# config opt prefix = /ufs/niels/scratch/rc/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/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 mal_init = ${exec_prefix}/lib/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 = inline,remap,evaluate,costModel,coercions,emptySet,cluster,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,garbageCollector,dataflow,history,multiplex -# cmdline opt config = /ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf -# cmdline opt gdk_nr_threads = 0 -# cmdline opt monet_mod_path = /ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/bin -# cmdline opt gdk_dbfarm = /ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/dbfarm -# cmdline opt mapi_open = true -# cmdline opt xrpc_open = true -# cmdline opt mapi_port = 30796 -# cmdline opt xrpc_port = 41543 -# cmdline opt monet_prompt = -# cmdline opt gdk_dbname = mTests_src_test_BugTracker-2009 -# cmdline opt mal_listing = 0 -#warning: please don't forget to set your vault key! -#(see /ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf) - -# 15:00:14 > -# 15:00:14 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=30796 -# 15:00:14 > - - -# 15:00:14 > -# 15:00:14 > Done. -# 15:00:14 > - diff --git a/sql/test/BugTracker-2009/Tests/prepare_commit_execute.SF-2606020.stable.out b/sql/test/BugTracker-2009/Tests/prepare_commit_execute.SF-2606020.stable.out deleted file mode 100644 --- a/sql/test/BugTracker-2009/Tests/prepare_commit_execute.SF-2606020.stable.out +++ /dev/null @@ -1,56 +0,0 @@ -stdout of test 'prepare_commit_execute.SF-2606020` in directory 'sql/test/BugTracker-2009` itself: - - -# 15:00:13 > -# 15:00:13 > mserver5 "--config=/ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf" --debug=10 --set gdk_nr_threads=0 --set "monet_mod_path=/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/bin" --set "gdk_dbfarm=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/dbfarm" --set mapi_open=true --set xrpc_open=true --set mapi_port=30796 --set xrpc_port=41543 --set monet_prompt= --trace "--dbname=mTests_src_test_BugTracker-2009" --set mal_listing=0 "--dbinit= include sql;" ; echo ; echo Over.. -# 15:00:13 > - -# MonetDB server v5.14.0, based on kernel v1.32.0 -# Serving database 'mTests_src_test_BugTracker-2009', using 4 threads -# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked -# Copyright (c) 1993-July 2008 CWI. -# Copyright (c) August 2008-2009 MonetDB B.V., all rights reserved -# Visit http://monetdb.cwi.nl/ for further information -# Listening for connection requests on mapi:monetdb://alf.ins.cwi.nl:30796/ -# MonetDB/SQL module v2.32.0 loaded - -#function user.main():void; -# clients.quit(); -#end main; - - -# 12:41:45 > -# 12:41:45 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=madrid" "--port=32243" -# 12:41:45 > - -#start transaction; -#create table pce (i int, s string); -#commit; -#start transaction; -#prepare insert into pce (i,s) values (?,?); -#prepare insert into pce (i,s) values (?,?); -% .prepare, .prepare, .prepare, .prepare, .prepare, .prepare # table_name -% type, digits, scale, schema, table, column # name -% varchar, int, int, str, str, str # type -% 4, 2, 1, 0, 0, 0 # length -[ "int", 32, 0, NULL, NULL, NULL ] -[ "clob", 0, 0, NULL, NULL, NULL ] -#exec 2(1,'test 1'); -[ 1 ] -% sys.pce, sys.pce # table_name -% i, s # name -% int, clob # type -% 1, 6 # length -[ 1, "test 1" ] -[ 1 ] -% sys.pce, sys.pce # table_name -% i, s # name -% int, clob # type -% 1, 6 # length -[ 1, "test 1" ] -[ 2, "test 2" ] - -# 15:00:14 > -# 15:00:14 > Done. -# 15:00:14 > - diff --git a/sql/test/BugTracker-2009/Tests/prepare_commit_execute.SF-2606020.test b/sql/test/BugTracker-2009/Tests/prepare_commit_execute.SF-2606020.test deleted file mode 100644 --- a/sql/test/BugTracker-2009/Tests/prepare_commit_execute.SF-2606020.test +++ /dev/null @@ -1,40 +0,0 @@ -statement ok -start transaction - -statement ok -create table pce (i int, s string) - -statement ok -commit - -statement ok -start transaction - -statement ok -prepare insert into pce (i,s) values (?,?) - -statement ok -exec **(1,'test 1') - -statement ok -select * from pce - -statement ok -commit - -statement ok -start transaction - -statement ok -exec **(2,'test 2') - -statement ok -select * from pce - -statement ok -commit - -statement ok -drop table pce - - diff --git a/sql/test/BugTracker-2009/Tests/prepare_decimal_bug.SF-2831994.sql b/sql/test/BugTracker-2009/Tests/prepare_decimal_bug.SF-2831994.sql deleted file mode 100644 --- a/sql/test/BugTracker-2009/Tests/prepare_decimal_bug.SF-2831994.sql +++ /dev/null @@ -1,9 +0,0 @@ -create table "test2831994" ( - "id" bigint, - "value" DECIMAL(5,5), - "value2" DECIMAL (5, 5) -); -prepare insert into "test2831994"("id","value","value2") values (?, ?, ?); -exec ** (3,0.0,2.34); -select * from test2831994; -drop table test2831994; diff --git a/sql/test/BugTracker-2009/Tests/prepare_decimal_bug.SF-2831994.stable.err b/sql/test/BugTracker-2009/Tests/prepare_decimal_bug.SF-2831994.stable.err deleted file mode 100644 --- a/sql/test/BugTracker-2009/Tests/prepare_decimal_bug.SF-2831994.stable.err +++ /dev/null @@ -1,21 +0,0 @@ -stderr of test 'prepare_decimal_bug.SF-2831994` in directory 'sql/test/BugTracker-2009` itself: - - -# 19:39:59 > -# 19:39:59 > mserver5 "--config=/ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf" --debug=10 --set gdk_nr_threads=0 --set "monet_mod_path=/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/bin" --set "gdk_dbfarm=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/dbfarm" --set mapi_open=true --set xrpc_open=true --set mapi_port=32876 --set xrpc_port=44483 --set monet_prompt= --trace "--dbname=mTests_src_test_BugTracker-2009" --set mal_listing=0 "--dbinit= include sql;" ; echo ; echo Over.. -# 19:39:59 > - -MAPI = (monetdb) /var/tmp/mtest-3249360/.s.monetdb.34748 -QUERY = exec 0 (3,0.0,2.34); -ERROR = !overflow in conversion to DECIMAL(5,5). -CODE = 22003 - -# 19:40:00 > -# 19:40:00 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=32876 -# 19:40:00 > - - -# 19:40:00 > -# 19:40:00 > Done. -# 19:40:00 > - diff --git a/sql/test/BugTracker-2009/Tests/prepare_decimal_bug.SF-2831994.stable.out b/sql/test/BugTracker-2009/Tests/prepare_decimal_bug.SF-2831994.stable.out deleted file mode 100644 --- a/sql/test/BugTracker-2009/Tests/prepare_decimal_bug.SF-2831994.stable.out +++ /dev/null @@ -1,46 +0,0 @@ -stdout of test 'prepare_decimal_bug.SF-2831994` in directory 'sql/test/BugTracker-2009` itself: - - -# 19:39:59 > -# 19:39:59 > mserver5 "--config=/ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf" --debug=10 --set gdk_nr_threads=0 --set "monet_mod_path=/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/bin" --set "gdk_dbfarm=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/dbfarm" --set mapi_open=true --set xrpc_open=true --set mapi_port=32876 --set xrpc_port=44483 --set monet_prompt= --trace "--dbname=mTests_src_test_BugTracker-2009" --set mal_listing=0 "--dbinit= include sql;" ; echo ; echo Over.. -# 19:39:59 > - -# MonetDB server v5.14.0, based on kernel v1.32.0 -# Serving database 'mTests_src_test_BugTracker-2009', using 4 threads -# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked -# Copyright (c) 1993-July 2008 CWI. -# Copyright (c) August 2008-2009 MonetDB B.V., all rights reserved -# Visit http://monetdb.cwi.nl/ for further information -# Listening for connection requests on mapi:monetdb://alf.ins.cwi.nl:32876/ -# MonetDB/SQL module v2.32.0 loaded - - -# 12:41:43 > -# 12:41:43 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=madrid" "--port=32243" -# 12:41:43 > - -#create table "test2831994" ( -# "id" bigint, -# "value" DECIMAL(5,5), -# "value2" DECIMAL (5, 5) -#); -#prepare insert into "test2831994"("id","value","value2") values (?, ?, ?); -#prepare insert into "test2831994"("id","value","value2") values (?, ?, ?); -% .prepare, .prepare, .prepare, .prepare, .prepare, .prepare # table_name -% type, digits, scale, schema, table, column # name -% varchar, int, int, str, str, str # type _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list