Changeset: fb230c0cba86 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fb230c0cba86
Modified Files:
sql/test/copy/Tests/columns.stable.err
sql/test/copy/Tests/int_parse.stable.err
sql/test/copy/Tests/load_stdin_incorrect_line_nr.stable.err
sql/test/copy/Tests/null_as_string_errors.stable.err
Branch: Dec2016
Log Message:
approved output
diffs (75 lines):
diff --git a/sql/test/copy/Tests/columns.stable.err
b/sql/test/copy/Tests/columns.stable.err
--- a/sql/test/copy/Tests/columns.stable.err
+++ b/sql/test/copy/Tests/columns.stable.err
@@ -31,8 +31,8 @@ stderr of test 'columns` in directory 's
MAPI = (monetdb) /var/tmp/mtest-15100/.s.monetdb.36199
QUERY = copy 3 records into tbl (i, d) from stdin delimiters ',','\n';
1,2.0
-ERROR = !Failed to import table Column value 2 missing
-MAPI = (monetdb) /var/tmp/mtest-15100/.s.monetdb.36199
+ERROR = !Failed to import table 'tbl', Column value 2 missing
+MAPI = (monetdb) /var/tmp/mtest-25850/.s.monetdb.38004
QUERY = 2,2.1
3,2.2
select * from tbl;
diff --git a/sql/test/copy/Tests/int_parse.stable.err
b/sql/test/copy/Tests/int_parse.stable.err
--- a/sql/test/copy/Tests/int_parse.stable.err
+++ b/sql/test/copy/Tests/int_parse.stable.err
@@ -34,8 +34,8 @@ MAPI = (monetdb) /var/tmp/mtest-29638/.
QUERY = copy 3 records into t_int from stdin USING DELIMITERS ',','\n','\"'
NULL AS '';
0
5.1
-ERROR = !Failed to import table line 2 field i 'int' expected in '5.1'
-MAPI = (monetdb) /var/tmp/mtest-30373/.s.monetdb.34287
+ERROR = !Failed to import table 't_int', line 2 field i 'int' expected in '5.1'
+MAPI = (monetdb) /var/tmp/mtest-25850/.s.monetdb.38004
QUERY = 9
select * from t_int;
@@ -44,8 +44,8 @@ MAPI = (monetdb) /var/tmp/mtest-29638/.
QUERY = copy 5 records into t_int from stdin delimiters ',','\n' NULL as '';
1
nil
-ERROR = !Failed to import table line 2 field i 'int' expected in 'nil'
-MAPI = (monetdb) /var/tmp/mtest-30373/.s.monetdb.34287
+ERROR = !Failed to import table 't_int', line 2 field i 'int' expected in 'nil'
+MAPI = (monetdb) /var/tmp/mtest-25850/.s.monetdb.38004
QUERY = null
abc
diff --git a/sql/test/copy/Tests/load_stdin_incorrect_line_nr.stable.err
b/sql/test/copy/Tests/load_stdin_incorrect_line_nr.stable.err
--- a/sql/test/copy/Tests/load_stdin_incorrect_line_nr.stable.err
+++ b/sql/test/copy/Tests/load_stdin_incorrect_line_nr.stable.err
@@ -73,7 +73,7 @@ MAPI = (monetdb) /var/tmp/mtest-29638/.
QUERY = COPY 2 RECORDS INTO "number" FROM stdin USING DELIMITERS ';', '\n';
1
bla
-ERROR = !Failed to import table line 2 field isanumber 'int' expected in 'bla'
+ERROR = !Failed to import table 'number', line 2 field isanumber 'int'
expected in 'bla'
# 17:35:33 >
# 17:35:33 > Done.
diff --git a/sql/test/copy/Tests/null_as_string_errors.stable.err
b/sql/test/copy/Tests/null_as_string_errors.stable.err
--- a/sql/test/copy/Tests/null_as_string_errors.stable.err
+++ b/sql/test/copy/Tests/null_as_string_errors.stable.err
@@ -83,15 +83,15 @@ stderr of test 'null_as_string_errors` i
MAPI = (monetdb) /var/tmp/mtest-29638/.s.monetdb.30099
QUERY = copy 1 records into null_as_string from stdin delimiters ',','\n' NULL
as '';
NULL,NULL,NULL
-ERROR = !Failed to import table line 1 field i 'int' expected in 'NULL'
-MAPI = (monetdb) /var/tmp/mtest-30373/.s.monetdb.34287
+ERROR = !Failed to import table 'null_as_string', line 1 field i 'int'
expected in 'NULL'
+MAPI = (monetdb) /var/tmp/mtest-25850/.s.monetdb.38004
QUERY = copy 1 records into null_as_string from stdin delimiters ',','\n' NULL
as '';
NULL,zero,0
-ERROR = !Failed to import table line 1 field i 'int' expected in 'NULL'
-MAPI = (monetdb) /var/tmp/mtest-30373/.s.monetdb.34287
+ERROR = !Failed to import table 'null_as_string', line 1 field i 'int'
expected in 'NULL'
+MAPI = (monetdb) /var/tmp/mtest-25850/.s.monetdb.38004
QUERY = copy 1 records into null_as_string from stdin delimiters ',','\n' NULL
as '';
2,two,NULL
-ERROR = !Failed to import table line 1 field d 'decimal(5,2)' expected in
'NULL'
+ERROR = !Failed to import table 'null_as_string', line 1 field d
'decimal(5,2)' expected in 'NULL'
# 08:37:31 >
# 08:37:31 > "Done."
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
