Changeset: a1fb3fd669fe for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a1fb3fd669fe Modified Files: Branch: default Log Message:
Merge with Oct2010 branch. diffs (truncated from 717 to 300 lines): diff -r b6d54ca6ce9d -r a1fb3fd669fe sql/src/test/Tests/alter-sequence.stable.out --- a/sql/src/test/Tests/alter-sequence.stable.out Thu Sep 09 15:04:13 2010 +0200 +++ b/sql/src/test/Tests/alter-sequence.stable.out Thu Sep 09 15:49:48 2010 +0200 @@ -35,7 +35,7 @@ [ 1 ] [ 1 ] [ 1 ] -% sys.test, sys.test # table_name +% sys.altseqtest, sys.altseqtest # table_name % t, v # name % int, char # type % 2, 1 # length diff -r b6d54ca6ce9d -r a1fb3fd669fe sql/src/test/Tests/coalesce.stable.err --- a/sql/src/test/Tests/coalesce.stable.err Thu Sep 09 15:04:13 2010 +0200 +++ b/sql/src/test/Tests/coalesce.stable.err Thu Sep 09 15:49:48 2010 +0200 @@ -80,10 +80,10 @@ # 20:30:43 > MAPI = mone...@alf:39627 -QUERY = select id, coalesce(age,'age unknown') from test; +QUERY = select id, coalesce(age,'age unknown') from coalescetest; ERROR = !SQLException:int:conversion of string 'age unknown' failed MAPI = mone...@alf:39627 -QUERY = select id, coalesce(name, age, 'unknown') from test; +QUERY = select id, coalesce(name, age, 'unknown') from coalescetest; ERROR = !SQLException:int:conversion of string 'unknown' failed # 20:30:44 > diff -r b6d54ca6ce9d -r a1fb3fd669fe sql/src/test/Tests/coalesce.stable.out --- a/sql/src/test/Tests/coalesce.stable.out Thu Sep 09 15:04:13 2010 +0200 +++ b/sql/src/test/Tests/coalesce.stable.out Thu Sep 09 15:49:48 2010 +0200 @@ -51,7 +51,7 @@ % double # type % 22 # length [ 30.5 ] -% sys.test, sys. # table_name +% sys.coalescetest, sys. # table_name % id, isnull_not_isnull_name # name % int, varchar # type % 1, 12 # length @@ -59,7 +59,7 @@ [ 2, "user unknown" ] [ 3, "c" ] [ 4, "user unknown" ] -% sys.test, sys. # table_name +% sys.coalescetest, sys. # table_name % id, isnull_not_isnull_age # name % int, int # type % 1, 2 # length @@ -72,13 +72,13 @@ % char # type % 0 # length [ "x" ] -% sys.test, sys.test, sys.test # table_name +% sys.coalescetest, sys.coalescetest, sys.coalescetest # table_name % id, name, age # name % int, varchar, int # type % 1, 0, 2 # length [ 2, NULL, 26 ] [ 4, NULL, NULL ] -% sys.test, sys.test, sys.test # table_name +% sys.coalescetest, sys.coalescetest, sys.coalescetest # table_name % id, name, age # name % int, varchar, int # type % 1, 0, 2 # length diff -r b6d54ca6ce9d -r a1fb3fd669fe sql/src/test/Tests/count.stable.out --- a/sql/src/test/Tests/count.stable.out Thu Sep 09 15:04:13 2010 +0200 +++ b/sql/src/test/Tests/count.stable.out Thu Sep 09 15:49:48 2010 +0200 @@ -30,17 +30,17 @@ [ 1 ] [ 1 ] [ 1 ] -% sys.test # table_name +% sys.counttest # table_name % L2 # name % wrd # type % 1 # length [ 6 ] -% sys.test # table_name +% sys.counttest # table_name % L3 # name % wrd # type % 1 # length [ 5 ] -% sys.test # table_name +% sys.counttest # table_name % count_x # name % wrd # type % 1 # length @@ -48,7 +48,7 @@ [ 1 ] [ 2 ] [ 2 ] -% sys.test # table_name +% sys.counttest # table_name % count_val # name % wrd # type % 1 # length diff -r b6d54ca6ce9d -r a1fb3fd669fe sql/src/test/Tests/decimal.stable.err --- a/sql/src/test/Tests/decimal.stable.err Thu Sep 09 15:04:13 2010 +0200 +++ b/sql/src/test/Tests/decimal.stable.err Thu Sep 09 15:49:48 2010 +0200 @@ -80,16 +80,16 @@ # 20:30:39 > MAPI = mone...@alf:39627 -QUERY = insert into test values (1234); +QUERY = insert into decimaltest values (1234); ERROR = !SQLException:convert:too many digits (6 > 5) MAPI = mone...@alf:39627 -QUERY = insert into test values (-1234); +QUERY = insert into decimaltest values (-1234); ERROR = !SQLException:convert:too many digits (6 > 5) MAPI = mone...@alf:39627 -QUERY = insert into test values (1234.1); +QUERY = insert into decimaltest values (1234.1); ERROR = !SQLException:convert:too many digits (6 > 5) MAPI = mone...@alf:39627 -QUERY = insert into test values (-1234.1); +QUERY = insert into decimaltest values (-1234.1); ERROR = !SQLException:convert:too many digits (6 > 5) # 20:30:39 > diff -r b6d54ca6ce9d -r a1fb3fd669fe sql/src/test/Tests/decimal.stable.out --- a/sql/src/test/Tests/decimal.stable.out Thu Sep 09 15:04:13 2010 +0200 +++ b/sql/src/test/Tests/decimal.stable.out Thu Sep 09 15:49:48 2010 +0200 @@ -51,7 +51,7 @@ [ 1 ] [ 1 ] [ 1 ] -% sys.test # table_name +% sys.decimaltest # table_name % t1 # name % decimal # type % 7 # length diff -r b6d54ca6ce9d -r a1fb3fd669fe sql/src/test/Tests/seq-default.stable.out --- a/sql/src/test/Tests/seq-default.stable.out Thu Sep 09 15:04:13 2010 +0200 +++ b/sql/src/test/Tests/seq-default.stable.out Thu Sep 09 15:49:48 2010 +0200 @@ -40,7 +40,7 @@ [ 1 ] [ 1 ] [ 1 ] -% sys.test, sys.test # table_name +% sys.seqdeftest, sys.seqdeftest # table_name % ts, i # name % timestamp, int # type % 26, 1 # length @@ -56,7 +56,7 @@ [ 1 ] [ 1 ] [ 1 ] -% sys.test, sys.test, sys.test, sys.test # table_name +% sys.seqdeftest, sys.seqdeftest, sys.seqdeftest, sys.seqdeftest # table_name % d, id, count, bla # name % date, int, int, int # type % 10, 1, 1, 3 # length diff -r b6d54ca6ce9d -r a1fb3fd669fe sql/src/test/Tests/string.stable.out --- a/sql/src/test/Tests/string.stable.out Thu Sep 09 15:04:13 2010 +0200 +++ b/sql/src/test/Tests/string.stable.out Thu Sep 09 15:49:48 2010 +0200 @@ -30,7 +30,7 @@ [ 1 ] [ 1 ] [ 1 ] -% sys.test, sys.test # table_name +% sys.stringtest, sys.stringtest # table_name % str, str2 # name % varchar, varchar # type % 6, 4 # length @@ -38,7 +38,7 @@ [ "test", "" ] [ "", "" ] [ " Test ", "" ] -% sys., sys.test # table_name +% sys., sys.stringtest # table_name % length_str, str # name % int, varchar # type % 1, 6 # length @@ -46,7 +46,7 @@ [ 4, "test" ] [ 0, "" ] [ 5, " Test " ] -% sys., sys.test # table_name +% sys., sys.stringtest # table_name % substring_str, str2 # name % varchar, varchar # type % 5, 4 # length @@ -54,7 +54,7 @@ [ "est", "" ] [ "", "" ] [ "Test ", "" ] -% sys., sys.test # table_name +% sys., sys.stringtest # table_name % substring_str, str2 # name % varchar, varchar # type % 5, 4 # length @@ -62,7 +62,7 @@ [ "est", "" ] [ "", "" ] [ "Test ", "" ] -% sys., sys.test # table_name +% sys., sys.stringtest # table_name % substring_str, str2 # name % varchar, varchar # type % 1, 4 # length @@ -70,7 +70,7 @@ [ "e", "" ] [ "", "" ] [ "T", "" ] -% sys., sys.test # table_name +% sys., sys.stringtest # table_name % substring_str, str2 # name % varchar, varchar # type % 1, 4 # length @@ -78,7 +78,7 @@ [ "e", "" ] [ "", "" ] [ "T", "" ] -% sys., sys.test # table_name +% sys., sys.stringtest # table_name % substring_str, str2 # name % varchar, varchar # type % 5, 4 # length @@ -86,7 +86,7 @@ [ "est", "" ] [ "", "" ] [ "Test ", "" ] -% sys., sys.test # table_name +% sys., sys.stringtest # table_name % substring_str, str2 # name % varchar, varchar # type % 5, 4 # length @@ -94,7 +94,7 @@ [ "est", "" ] [ "", "" ] [ "Test ", "" ] -% sys., sys.test, sys.test # table_name +% sys., sys.stringtest, sys.stringtest # table_name % locate_str, str, str2 # name % int, varchar, varchar # type % 1, 6, 4 # length @@ -102,7 +102,7 @@ [ 0, "test", "" ] [ 1, "", "" ] [ 0, " Test ", "" ] -% sys., sys.test, sys.test # table_name +% sys., sys.stringtest, sys.stringtest # table_name % locate_str, str, str2 # name % int, varchar, varchar # type % 1, 6, 4 # length @@ -110,7 +110,7 @@ [ 0, "test", "" ] [ 1, "", "" ] [ 0, " Test ", "" ] -% sys., sys.test # table_name +% sys., sys.stringtest # table_name % ascii_str, str # name % int, varchar # type % 3, 6 # length @@ -118,7 +118,7 @@ [ 116, "test" ] [ NULL, "" ] [ 32, " Test " ] -% sys., sys.test # table_name +% sys., sys.stringtest # table_name % code_ascii_str, str # name % char, varchar # type % 0, 6 # length @@ -126,7 +126,7 @@ [ "t", "test" ] [ NULL, "" ] [ " ", " Test " ] -% sys., sys.test # table_name +% sys., sys.stringtest # table_name % left_str, str # name % varchar, varchar # type % 3, 6 # length @@ -134,7 +134,7 @@ [ "tes", "test" ] [ "", "" ] [ " Te", " Test " ] -% sys., sys.test # table_name +% sys., sys.stringtest # table_name % right_str, str # name % varchar, varchar # type % 3, 6 # length @@ -142,7 +142,7 @@ [ "est", "test" ] [ "", "" ] [ "st ", " Test " ] -% sys., sys.test # table_name +% sys., sys.stringtest # table_name % lower_str, str # name % varchar, varchar # type % 6, 6 # length @@ -150,7 +150,7 @@ [ "test", "test" ] [ "", "" ] [ " test ", " Test " ] -% sys., sys.test # table_name +% sys., sys.stringtest # table_name % lcase_str, str # name _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
