Changeset: 8b62afc5437f for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8b62afc5437f Added Files: sql/test/prepare/Tests/prepare-where.SF-1238867.1238959.1238965.1240124.sql sql/test/prepare/Tests/prepare-where.SF-1238867.1238959.1238965.1240124.stable.err sql/test/prepare/Tests/prepare-where.SF-1238867.1238959.1238965.1240124.stable.out sql/test/prepare/Tests/prepare-where.SF-1238867.1238959.1238965.1240124.test sql/test/prepare/Tests/prepare_doesnot_like_LIKE.SF-1234205.sql sql/test/prepare/Tests/prepare_doesnot_like_LIKE.SF-1234205.stable.err sql/test/prepare/Tests/prepare_doesnot_like_LIKE.SF-1234205.stable.out sql/test/prepare/Tests/prepare_doesnot_like_LIKE.SF-1234205.test Removed Files: sql/test/BugDay_2005-12-19_2.9.3/Tests/prepare-where.SF-1238867.1238959.1238965.1240124.sql sql/test/BugDay_2005-12-19_2.9.3/Tests/prepare-where.SF-1238867.1238959.1238965.1240124.stable.err sql/test/BugDay_2005-12-19_2.9.3/Tests/prepare-where.SF-1238867.1238959.1238965.1240124.stable.out sql/test/BugDay_2005-12-19_2.9.3/Tests/prepare-where.SF-1238867.1238959.1238965.1240124.test sql/test/BugDay_2005-12-19_2.9.3/Tests/prepare_doesnot_like_LIKE.SF-1234205.sql sql/test/BugDay_2005-12-19_2.9.3/Tests/prepare_doesnot_like_LIKE.SF-1234205.stable.err sql/test/BugDay_2005-12-19_2.9.3/Tests/prepare_doesnot_like_LIKE.SF-1234205.stable.out sql/test/BugDay_2005-12-19_2.9.3/Tests/prepare_doesnot_like_LIKE.SF-1234205.test Modified Files: sql/test/BugDay_2005-12-19_2.9.3/Tests/All sql/test/prepare/Tests/All Branch: mtest Log Message:
just moved 2 to prepare diffs (truncated from 470 to 300 lines): diff --git a/sql/test/BugDay_2005-12-19_2.9.3/Tests/All b/sql/test/BugDay_2005-12-19_2.9.3/Tests/All --- a/sql/test/BugDay_2005-12-19_2.9.3/Tests/All +++ b/sql/test/BugDay_2005-12-19_2.9.3/Tests/All @@ -3,8 +3,6 @@ NULL_in_CASE.SF-1211335 cast_bigint_to_int.SF-1211903 in_operator.SF-1211925 -prepare_doesnot_like_LIKE.SF-1234205 -prepare-where.SF-1238867.1238959.1238965.1240124 delete_where_1_equals_1.SF-1240162 subselect_cardinality.SF-1240701.1242164 default_next_value_for_non_ex_seq.SF.1246631 diff --git a/sql/test/BugDay_2005-12-19_2.9.3/Tests/prepare-where.SF-1238867.1238959.1238965.1240124.sql b/sql/test/BugDay_2005-12-19_2.9.3/Tests/prepare-where.SF-1238867.1238959.1238965.1240124.sql deleted file mode 100644 --- a/sql/test/BugDay_2005-12-19_2.9.3/Tests/prepare-where.SF-1238867.1238959.1238965.1240124.sql +++ /dev/null @@ -1,8 +0,0 @@ --- bug 1238867 -prepare select * from env() as env where 1 = ?; --- bug 1238959 -prepare select * from env() as env where ? = ?; --- bug 1238965 -prepare select ? from env() as env; --- bug 1240124 -prepare select * from env() as env where name in (?); diff --git a/sql/test/BugDay_2005-12-19_2.9.3/Tests/prepare-where.SF-1238867.1238959.1238965.1240124.stable.err b/sql/test/BugDay_2005-12-19_2.9.3/Tests/prepare-where.SF-1238867.1238959.1238965.1240124.stable.err deleted file mode 100644 --- a/sql/test/BugDay_2005-12-19_2.9.3/Tests/prepare-where.SF-1238867.1238959.1238965.1240124.stable.err +++ /dev/null @@ -1,25 +0,0 @@ -stderr of test 'prepare-where.SF-1238867.1238959.1238965.1240124` in directory 'sql/test/BugDay_2005-12-19_2.9.3` itself: - - -# 13:00:06 > -# 13:00:06 > Mtimeout -timeout 180 Mserver "--config=/ufs/sjoerd/Monet-virgin/etc/MonetDB.conf" --debug=10 --set "monet_mod_path=/ufs/sjoerd/src/MonetDB/devel/sql-virgin/Linux/lib/MonetDB:/ufs/sjoerd/Monet-virgin/lib/MonetDB" --set "gdk_dbfarm=/ufs/sjoerd/Monet-virgin/var/MonetDB/dbfarm" --set "sql_logdir=/ufs/sjoerd/Monet-virgin/var/MonetDB/log" --set mapi_port=33659 --set sql_port=41457 --set xquery_port=54179 --set monet_prompt= --trace "--dbname=mTests_src_test_BugDay_2005-12-19_2.9.3" --dbinit="module(sql_server); sql_server_start();" ; echo ; echo Over.. -# 13:00:06 > - - -# 13:00:07 > -# 13:00:07 > Mtimeout -timeout 60 MapiClient -lsql -u monetdb -P monetdb --host=localhost --port=41457 < prepare-where.SF-1238867.1238959.1238965.1240124.sql -# 13:00:07 > - -MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395 -QUERY = prepare select * from env() as env where ? = ?; -ERROR = !Cannot have a parameter (?) on both sides of an expression -CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685 -QUERY = prepare select ? from env() as env; -ERROR = !Could not determine type for argument number 1 -CODE = 42000 - -# 13:00:07 > -# 13:00:07 > Done. -# 13:00:07 > - diff --git a/sql/test/BugDay_2005-12-19_2.9.3/Tests/prepare-where.SF-1238867.1238959.1238965.1240124.stable.out b/sql/test/BugDay_2005-12-19_2.9.3/Tests/prepare-where.SF-1238867.1238959.1238965.1240124.stable.out deleted file mode 100644 --- a/sql/test/BugDay_2005-12-19_2.9.3/Tests/prepare-where.SF-1238867.1238959.1238965.1240124.stable.out +++ /dev/null @@ -1,41 +0,0 @@ -stdout of test 'prepare-where.SF-1238867.1238959.1238965.1240124` in directory 'sql/test/BugDay_2005-12-19_2.9.3` itself: - - -# 13:00:06 > -# 13:00:06 > Mtimeout -timeout 180 Mserver "--config=/ufs/sjoerd/Monet-virgin/etc/MonetDB.conf" --debug=10 --set "monet_mod_path=/ufs/sjoerd/src/MonetDB/devel/sql-virgin/Linux/lib/MonetDB:/ufs/sjoerd/Monet-virgin/lib/MonetDB" --set "gdk_dbfarm=/ufs/sjoerd/Monet-virgin/var/MonetDB/dbfarm" --set "sql_logdir=/ufs/sjoerd/Monet-virgin/var/MonetDB/log" --set mapi_port=33659 --set sql_port=41457 --set xquery_port=54179 --set monet_prompt= --trace "--dbname=mTests_src_test_BugDay_2005-12-19_2.9.3" --dbinit="module(sql_server); sql_server_start();" ; echo ; echo Over.. -# 13:00:06 > - -# Monet Database Server V4.9.3 -# Copyright (c) 1993-2005, CWI. All rights reserved. -# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs; dynamically linked. -# Visit http://monetdb.cwi.nl/ for further information. - - - -# 12:37:36 > -# 12:37:36 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=madrid" "--port=32243" -# 12:37:36 > - -#prepare select * from env() as env where 1 = ?; -#prepare select * from env() as env where 1 = ?; -% .prepare, .prepare, .prepare, .prepare, .prepare, .prepare # table_name -% type, digits, scale, schema, table, column # name -% varchar, int, int, str, str, str # type -% 7, 4, 1, 0, 3, 5 # length -[ "varchar", 1024, 0, "", "env", "name" ] -[ "varchar", 2048, 0, "", "env", "value" ] -[ "tinyint", 1, 0, NULL, NULL, NULL ] -#prepare select * from env() as env where name in (?); -#prepare select * from env() as env where name in (?); -% .prepare, .prepare, .prepare, .prepare, .prepare, .prepare # table_name -% type, digits, scale, schema, table, column # name -% varchar, int, int, str, str, str # type -% 7, 7, 1, 0, 3, 5 # length -[ "varchar", 1024, 0, "", "env", "name" ] -[ "varchar", 2048, 0, "", "env", "value" ] -[ "varchar", 1024, 0, NULL, NULL, NULL ] - -# 12:37:36 > -# 12:37:36 > "Done." -# 12:37:36 > - diff --git a/sql/test/BugDay_2005-12-19_2.9.3/Tests/prepare-where.SF-1238867.1238959.1238965.1240124.test b/sql/test/BugDay_2005-12-19_2.9.3/Tests/prepare-where.SF-1238867.1238959.1238965.1240124.test deleted file mode 100644 --- a/sql/test/BugDay_2005-12-19_2.9.3/Tests/prepare-where.SF-1238867.1238959.1238965.1240124.test +++ /dev/null @@ -1,13 +0,0 @@ -statement ok -prepare select * from env() as env where 1 = ? - -statement error -prepare select * from env() as env where ? = ? - -statement error -prepare select ? from env() as env - -statement ok -prepare select * from env() as env where name in (?) - - diff --git a/sql/test/BugDay_2005-12-19_2.9.3/Tests/prepare_doesnot_like_LIKE.SF-1234205.sql b/sql/test/BugDay_2005-12-19_2.9.3/Tests/prepare_doesnot_like_LIKE.SF-1234205.sql deleted file mode 100644 --- a/sql/test/BugDay_2005-12-19_2.9.3/Tests/prepare_doesnot_like_LIKE.SF-1234205.sql +++ /dev/null @@ -1,7 +0,0 @@ -create table t1234205 (name varchar(1024)); -insert into t1234205 values ('niels'),('fabian'),('martin'); - -prepare select name from t1234205 where name like ?; -exec ** ('%'); -prepare select name from t1234205 where name like 'n%'; -exec ** (); diff --git a/sql/test/BugDay_2005-12-19_2.9.3/Tests/prepare_doesnot_like_LIKE.SF-1234205.stable.err b/sql/test/BugDay_2005-12-19_2.9.3/Tests/prepare_doesnot_like_LIKE.SF-1234205.stable.err deleted file mode 100644 --- a/sql/test/BugDay_2005-12-19_2.9.3/Tests/prepare_doesnot_like_LIKE.SF-1234205.stable.err +++ /dev/null @@ -1,17 +0,0 @@ -stderr of test 'prepare_doesnot_like_LIKE.SF-1234205` in directory 'sql/test/BugDay_2005-12-19_2.9.3` itself: - - -# 09:15:18 > -# 09:15:18 > Mtimeout -timeout 180 Mserver "--config=/ufs/niels/scratch/rc/Linux-x86_64/etc/MonetDB.conf" --debug=10 --set "monet_mod_path=/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB:/ufs/niels/scratch/rc/Linux-x86_64/lib/bin" --set "gdk_dbfarm=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB/dbfarm" --set "sql_logdir=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB/log" --set mapi_port=36877 --set monet_prompt= --trace "--dbname=mTests_src_test_BugDay_2005-12-19_2.9.3" --dbinit="module(sql_server); sql_server_start();" ; echo ; echo Over.. -# 09:15:18 > - - -# 09:15:18 > -# 09:15:18 > Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb --host=localhost --port=36877 < prepare_doesnot_like_LIKE.SF-1234205.sql -# 09:15:18 > - - -# 09:15:18 > -# 09:15:18 > Done. -# 09:15:18 > - diff --git a/sql/test/BugDay_2005-12-19_2.9.3/Tests/prepare_doesnot_like_LIKE.SF-1234205.stable.out b/sql/test/BugDay_2005-12-19_2.9.3/Tests/prepare_doesnot_like_LIKE.SF-1234205.stable.out deleted file mode 100644 --- a/sql/test/BugDay_2005-12-19_2.9.3/Tests/prepare_doesnot_like_LIKE.SF-1234205.stable.out +++ /dev/null @@ -1,54 +0,0 @@ -stdout of test 'prepare_doesnot_like_LIKE.SF-1234205` in directory 'sql/test/BugDay_2005-12-19_2.9.3` itself: - - -# 09:15:18 > -# 09:15:18 > Mtimeout -timeout 180 Mserver "--config=/ufs/niels/scratch/rc/Linux-x86_64/etc/MonetDB.conf" --debug=10 --set "monet_mod_path=/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB:/ufs/niels/scratch/rc/Linux-x86_64/lib/bin" --set "gdk_dbfarm=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB/dbfarm" --set "sql_logdir=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB/log" --set mapi_port=36877 --set monet_prompt= --trace "--dbname=mTests_src_test_BugDay_2005-12-19_2.9.3" --dbinit="module(sql_server); sql_server_start();" ; echo ; echo Over.. -# 09:15:18 > - -# Monet Database Server V4.12.0_rc1 -# Copyright (c) 1993-2006, CWI. All rights reserved. -# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs; dynamically linked. -# Visit http://monetdb.cwi.nl/ for further information. - - - - -# 09:15:18 > -# 09:15:18 > Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb --host=localhost --port=36877 < prepare_doesnot_like_LIKE.SF-1234205.sql -# 09:15:18 > - -[ 3 ] -#prepare select name from t1234205 where name like ?; -#prepare select name from t1234205 where name like ?; -% .prepare, .prepare, .prepare, .prepare, .prepare, .prepare # table_name -% type, digits, scale, schema, table, column # name -% varchar, int, int, str, str, str # type -% 7, 4, 1, 0, 8, 4 # length -[ "varchar", 1024, 0, "", "t1234205", "name" ] -[ "char", 0, 0, NULL, NULL, NULL ] -#execute 3 ('%'); -% sys.t1234205 # table_name -% name # name -% varchar # type -% 6 # length -[ "niels" ] -[ "fabian" ] -[ "martin" ] -#prepare select name from t1234205 where name like 'n%'; -#prepare select name from t1234205 where name like 'n%'; -% .prepare, .prepare, .prepare, .prepare, .prepare, .prepare # table_name -% type, digits, scale, schema, table, column # name -% varchar, int, int, str, str, str # type -% 7, 4, 1, 0, 8, 4 # length -[ "varchar", 1024, 0, "", "t1234205", "name" ] -#execute 4 (); -% sys.t1234205 # table_name -% name # name -% varchar # type -% 5 # length -[ "niels" ] - -# 09:15:18 > -# 09:15:18 > Done. -# 09:15:18 > - diff --git a/sql/test/BugDay_2005-12-19_2.9.3/Tests/prepare_doesnot_like_LIKE.SF-1234205.test b/sql/test/BugDay_2005-12-19_2.9.3/Tests/prepare_doesnot_like_LIKE.SF-1234205.test deleted file mode 100644 --- a/sql/test/BugDay_2005-12-19_2.9.3/Tests/prepare_doesnot_like_LIKE.SF-1234205.test +++ /dev/null @@ -1,19 +0,0 @@ -statement ok -create table t1234205 (name varchar(1024)) - -statement ok -insert into t1234205 values ('niels'),('fabian'),('martin') - -statement ok -prepare select name from t1234205 where name like ? - -statement ok -exec ** ('%') - -statement ok -prepare select name from t1234205 where name like 'n%' - -statement ok -exec ** () - - diff --git a/sql/test/prepare/Tests/All b/sql/test/prepare/Tests/All --- a/sql/test/prepare/Tests/All +++ b/sql/test/prepare/Tests/All @@ -11,4 +11,5 @@ prepared-merge-statement.Bug-6706 prepare-types.Bug-6724 prepared-select-with-error-causes-hang.Bug-6761 sample.15 - +prepare-where.SF-1238867.1238959.1238965.1240124 +prepare_doesnot_like_LIKE.SF-1234205 diff --git a/sql/test/prepare/Tests/prepare-where.SF-1238867.1238959.1238965.1240124.sql b/sql/test/prepare/Tests/prepare-where.SF-1238867.1238959.1238965.1240124.sql new file mode 100644 --- /dev/null +++ b/sql/test/prepare/Tests/prepare-where.SF-1238867.1238959.1238965.1240124.sql @@ -0,0 +1,8 @@ +-- bug 1238867 +prepare select * from env() as env where 1 = ?; +-- bug 1238959 +prepare select * from env() as env where ? = ?; +-- bug 1238965 +prepare select ? from env() as env; +-- bug 1240124 +prepare select * from env() as env where name in (?); diff --git a/sql/test/prepare/Tests/prepare-where.SF-1238867.1238959.1238965.1240124.stable.err b/sql/test/prepare/Tests/prepare-where.SF-1238867.1238959.1238965.1240124.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/prepare/Tests/prepare-where.SF-1238867.1238959.1238965.1240124.stable.err @@ -0,0 +1,25 @@ +stderr of test 'prepare-where.SF-1238867.1238959.1238965.1240124` in directory 'sql/test/BugDay_2005-12-19_2.9.3` itself: + + +# 13:00:06 > +# 13:00:06 > Mtimeout -timeout 180 Mserver "--config=/ufs/sjoerd/Monet-virgin/etc/MonetDB.conf" --debug=10 --set "monet_mod_path=/ufs/sjoerd/src/MonetDB/devel/sql-virgin/Linux/lib/MonetDB:/ufs/sjoerd/Monet-virgin/lib/MonetDB" --set "gdk_dbfarm=/ufs/sjoerd/Monet-virgin/var/MonetDB/dbfarm" --set "sql_logdir=/ufs/sjoerd/Monet-virgin/var/MonetDB/log" --set mapi_port=33659 --set sql_port=41457 --set xquery_port=54179 --set monet_prompt= --trace "--dbname=mTests_src_test_BugDay_2005-12-19_2.9.3" --dbinit="module(sql_server); sql_server_start();" ; echo ; echo Over.. +# 13:00:06 > + + +# 13:00:07 > +# 13:00:07 > Mtimeout -timeout 60 MapiClient -lsql -u monetdb -P monetdb --host=localhost --port=41457 < prepare-where.SF-1238867.1238959.1238965.1240124.sql +# 13:00:07 > + +MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395 +QUERY = prepare select * from env() as env where ? = ?; +ERROR = !Cannot have a parameter (?) on both sides of an expression +CODE = 42000 +MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685 +QUERY = prepare select ? from env() as env; +ERROR = !Could not determine type for argument number 1 +CODE = 42000 + +# 13:00:07 > +# 13:00:07 > Done. +# 13:00:07 > + diff --git a/sql/test/prepare/Tests/prepare-where.SF-1238867.1238959.1238965.1240124.stable.out b/sql/test/prepare/Tests/prepare-where.SF-1238867.1238959.1238965.1240124.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/prepare/Tests/prepare-where.SF-1238867.1238959.1238965.1240124.stable.out @@ -0,0 +1,41 @@ +stdout of test 'prepare-where.SF-1238867.1238959.1238965.1240124` in directory 'sql/test/BugDay_2005-12-19_2.9.3` itself: + + +# 13:00:06 > +# 13:00:06 > Mtimeout -timeout 180 Mserver "--config=/ufs/sjoerd/Monet-virgin/etc/MonetDB.conf" --debug=10 --set "monet_mod_path=/ufs/sjoerd/src/MonetDB/devel/sql-virgin/Linux/lib/MonetDB:/ufs/sjoerd/Monet-virgin/lib/MonetDB" --set "gdk_dbfarm=/ufs/sjoerd/Monet-virgin/var/MonetDB/dbfarm" --set "sql_logdir=/ufs/sjoerd/Monet-virgin/var/MonetDB/log" --set mapi_port=33659 --set sql_port=41457 --set xquery_port=54179 --set monet_prompt= --trace "--dbname=mTests_src_test_BugDay_2005-12-19_2.9.3" --dbinit="module(sql_server); sql_server_start();" ; echo ; echo Over.. +# 13:00:06 > _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
