Changeset: f31cfc0b3b1c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f31cfc0b3b1c
Modified Files:
sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.stable.err
sql/test/BugDay_2005-10-06_2.9.3/Tests/div_by_zero.SF-987304.stable.err
sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
sql/test/BugTracker/Tests/string2int_conversion.SF-1356068.stable.err
sql/test/Tests/coalesce.stable.err
sql/test/Tests/session_vars.stable.err
sql/test/Tests/session_vars.stable.out
sql/test/Via-m/Tests/file_s12.stable.err
Branch: gdk-calc
Log Message:
Approve new error messages.
diffs (164 lines):
diff --git
a/sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.stable.err
b/sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.stable.err
--- a/sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.stable.err
+++ b/sql/test/BugDay_2005-10-06_2.8/Tests/mixed_type.SF-917372.stable.err
@@ -79,12 +79,12 @@ stderr of test 'mixed_type.SF-917372` in
# 19:21:06 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=33392
# 19:21:06 >
-MAPI = monetdb@sofia:39182
+MAPI = monetdb@madrid:34599
QUERY = select 'a'+1;
-ERROR = !conversion of string 'a' failed
-MAPI = monetdb@sofia:39182
+ERROR = !conversion of string 'a' to type bte failed.
+MAPI = monetdb@madrid:34599
QUERY = select 1-'a';
-ERROR = !conversion of string 'a' failed
+ERROR = !conversion of string 'a' to type bte failed.
# 19:21:06 >
# 19:21:06 > Done.
diff --git
a/sql/test/BugDay_2005-10-06_2.9.3/Tests/div_by_zero.SF-987304.stable.err
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/div_by_zero.SF-987304.stable.err
--- a/sql/test/BugDay_2005-10-06_2.9.3/Tests/div_by_zero.SF-987304.stable.err
+++ b/sql/test/BugDay_2005-10-06_2.9.3/Tests/div_by_zero.SF-987304.stable.err
@@ -79,12 +79,12 @@ stderr of test 'div_by_zero.SF-987304` i
# 19:22:52 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=32644
# 19:22:52 >
-MAPI = monetdb@madrid:31650
+MAPI = monetdb@madrid:34599
QUERY = select 1/0;
-ERROR = !Illegal argument Division by zero
-MAPI = monetdb@madrid:31650
+ERROR = !division by zero.
+MAPI = monetdb@madrid:34599
QUERY = select x/y from a;
-ERROR = !Division by zero
+ERROR = !division by zero.
# 19:22:52 >
# 19:22:52 > Done.
diff --git a/sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
b/sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
--- a/sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
+++ b/sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
@@ -61,7 +61,7 @@ function user.s1_1{autoCommit=true}():vo
X_6:bat[:oid,:oid] := sql.bind_dbat(X_2,"sys","sf_2596114",1);
X_9 := bat.reverse(X_6);
X_18 := algebra.kdifference(X_17,X_9);
- X_19:bat[:oid,:dbl] := batcalc.*(X_18,X_18,true,true);
+ X_19:bat[:oid,:dbl] := batcalc.*(X_18,X_18);
X_20 := sql.resultSet(1,1,X_19);
sql.rsColumn(X_20,"sys.","sql_mul_x","double",53,0,X_19);
X_25 := io.stdout();
diff --git
a/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
b/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
--- a/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
+++ b/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
@@ -36,7 +36,7 @@ Ready.
% 65 # length
function user.s1_1{autoCommit=true}(A0:flt):void;
X_24 := nil:bat[:oid,:dbl];
-barrier X_56 := language.dataflow();
+barrier X_61 := language.dataflow();
X_3 := sql.mvc();
X_13:bat[:oid,:dbl] := sql.bind(X_3,"sys","tab_2826","d",0);
X_11:bat[:oid,:dbl] := sql.bind(X_3,"sys","tab_2826","d",2);
@@ -53,7 +53,7 @@ barrier X_56 := language.dataflow();
X_22 := algebra.markT(X_20,0@0:oid);
X_23 := bat.reverse(X_22);
X_24 := algebra.leftjoin(X_23,X_18);
-exit X_56;
+exit X_61;
X_25 := sql.resultSet(1,1,X_24);
sql.rsColumn(X_25,"sys.tab_2826","d","double",53,0,X_24);
X_31 := io.stdout();
diff --git
a/sql/test/BugTracker/Tests/string2int_conversion.SF-1356068.stable.err
b/sql/test/BugTracker/Tests/string2int_conversion.SF-1356068.stable.err
--- a/sql/test/BugTracker/Tests/string2int_conversion.SF-1356068.stable.err
+++ b/sql/test/BugTracker/Tests/string2int_conversion.SF-1356068.stable.err
@@ -79,12 +79,12 @@ stderr of test 'string2int_conversion.SF
# 19:33:07 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=33470
# 19:33:07 >
-MAPI = monetdb@sofia:39182
+MAPI = monetdb@madrid:34599
QUERY = insert into test values ('');
-ERROR = !conversion of string '' failed
-MAPI = monetdb@sofia:39182
+ERROR = !conversion of string '' to type sht failed.
+MAPI = monetdb@madrid:34599
QUERY = insert into test values ('');
-ERROR = !conversion of string '' failed
+ERROR = !conversion of string '' to type sht failed.
# 19:33:07 >
# 19:33:07 > Done.
diff --git a/sql/test/Tests/coalesce.stable.err
b/sql/test/Tests/coalesce.stable.err
--- a/sql/test/Tests/coalesce.stable.err
+++ b/sql/test/Tests/coalesce.stable.err
@@ -79,12 +79,12 @@ stderr of test 'coalesce` in directory '
# 20:30:43 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=39627
# 20:30:43 >
-MAPI = monetdb@sofia:39182
+MAPI = monetdb@madrid:34599
QUERY = select id, coalesce(age,'age unknown') from coalescetest;
-ERROR = !conversion of string 'age unknown' failed
-MAPI = monetdb@sofia:39182
+ERROR = !conversion of string 'age unknown' to type int failed.
+MAPI = monetdb@madrid:34599
QUERY = select id, coalesce(name, age, 'unknown') from coalescetest;
-ERROR = !conversion of string 'unknown' failed
+ERROR = !conversion of string 'unknown' to type int failed.
# 20:30:44 >
# 20:30:44 > Done.
diff --git a/sql/test/Tests/session_vars.stable.err
b/sql/test/Tests/session_vars.stable.err
--- a/sql/test/Tests/session_vars.stable.err
+++ b/sql/test/Tests/session_vars.stable.err
@@ -79,9 +79,12 @@ stderr of test 'session_vars` in directo
# 20:30:42 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=39627
# 20:30:42 >
-MAPI = monetdb@sofia:39182
+MAPI = monetdb@madrid:34599
QUERY = set test_nr = 'help';
-ERROR = !conversion of string 'help' failed
+ERROR = !conversion of string 'help' to type int failed.
+MAPI = monetdb@madrid:34599
+QUERY = set test_boolean = 'help';
+ERROR = !conversion of string 'help' to type bit failed.
# 20:30:43 >
# 20:30:43 > Done.
diff --git a/sql/test/Tests/session_vars.stable.out
b/sql/test/Tests/session_vars.stable.out
--- a/sql/test/Tests/session_vars.stable.out
+++ b/sql/test/Tests/session_vars.stable.out
@@ -102,7 +102,7 @@ Ready.
% single_value # name
% boolean # type
% 5 # length
-[ NULL ]
+[ true ]
# 12:30:00 >
# 12:30:00 > Done.
diff --git a/sql/test/Via-m/Tests/file_s12.stable.err
b/sql/test/Via-m/Tests/file_s12.stable.err
--- a/sql/test/Via-m/Tests/file_s12.stable.err
+++ b/sql/test/Via-m/Tests/file_s12.stable.err
@@ -67,7 +67,7 @@ stderr of test 'file_s12` in directory '
# 10:55:23 > mclient -lsql -umonetdb -Pmonetdb --host=yngling --port=35218
# 10:55:23 >
-MAPI = monetdb@sofia:38256
+MAPI = monetdb@madrid:34599
QUERY = set return_id = i_add_video_file('dummy description',
'fabchannel2007',
'identifier4',
@@ -78,7 +78,7 @@ QUERY = set return_id = i_add_video_file
125,
'codec 1',
2000);
-ERROR = !conversion of string 'identifier4' failed
+ERROR = !conversion of string 'identifier4' to type lng failed.
# 10:55:23 >
# 10:55:23 > Done.
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
