Changeset: 6c7a10187766 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6c7a10187766 Modified Files: sql/test/copy/Tests/int_parse.stable.err sql/test/copy/Tests/int_parse.stable.out sql/test/copy/Tests/load_stdin_incorrect_line_nr.stable.err sql/test/copy/Tests/load_stdin_incorrect_line_nr.stable.out sql/test/copy/Tests/null_as_string_errors.stable.err sql/test/copy/Tests/null_as_string_errors.stable.out Branch: resultset Log Message:
approved error messages diffs (276 lines): 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 @@ -79,11 +79,20 @@ stderr of test 'int_parse` in directory # 19:40:24 > mclient -lsql -umonetdb -Pmonetdb --host=eir --port=37659 # 19:40:24 > -# 13:10:05 > -# 13:10:05 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=sofia" "--port=38256" -# 13:10:05 > +MAPI = (monetdb) /var/tmp/mtest-17547/.s.monetdb.38582 +QUERY = copy 1 records into t_int from stdin USING DELIMITERS ',','\n','\"' NULL AS ''; + 5.1 +ERROR = !line 1 field 1 'int' expected in '5.1'. Failed to import table +MAPI = (monetdb) /var/tmp/mtest-17547/.s.monetdb.38582 +QUERY = copy 5 records into t_int from stdin delimiters ',','\n' NULL as ''; + 1 + nil -# 08:29:21 > -# 08:29:21 > "Done." -# 08:29:21 > + null + abc +ERROR = !line 4 field 1 'int' expected in 'null'. Failed to import table +# 11:54:08 > +# 11:54:08 > "Done." +# 11:54:08 > + diff --git a/sql/test/copy/Tests/int_parse.stable.out b/sql/test/copy/Tests/int_parse.stable.out --- a/sql/test/copy/Tests/int_parse.stable.out +++ b/sql/test/copy/Tests/int_parse.stable.out @@ -43,9 +43,6 @@ Ready. % rowid, fldid, message, input # name % bigint, int, clob, clob # type % 1, 1, 0, 0 # length -#copy 1 records into t_int from stdin USING DELIMITERS ',','\n','\"' NULL AS ''; -#5.1 -[ 1 ] #select * from t_int; % sys.t_int # table_name % i # name @@ -54,20 +51,12 @@ Ready. [ NULL ] [ 3 ] [ -4 ] -[ NULL ] #select * from sys.rejects; % .rejects, .rejects, .rejects, .rejects # table_name % rowid, fldid, message, input # name % bigint, int, clob, clob # type -% 1, 1, 15, 4 # length -[ 0@0, 0, "'int' expected ", "5.1\n" ] -#copy 5 records into t_int from stdin delimiters ',','\n' NULL as ''; -#1 -#nil -# -#null -#abc -[ 5 ] +% 1, 1, 14, 4 # length +[ 1, 1, "'int' expected", "5.1\n" ] #select * from t_int; % sys.t_int # table_name % i # name @@ -76,19 +65,13 @@ Ready. [ NULL ] [ 3 ] [ -4 ] -[ NULL ] -[ 1 ] -[ NULL ] -[ NULL ] -[ NULL ] -[ NULL ] #select * from sys.rejects; % .rejects, .rejects, .rejects, .rejects # table_name % rowid, fldid, message, input # name % bigint, int, clob, clob # type -% 1, 1, 15, 5 # length -[ 3@0, 0, "'int' expected ", "null\n" ] -[ 4@0, 0, "'int' expected ", "abc\n" ] +% 1, 1, 14, 5 # length +[ 4, 1, "'int' expected", "null\n" ] +[ 5, 1, "'int' expected", "abc\n" ] #drop table t_int; # 08:29:21 > 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 @@ -69,6 +69,11 @@ stderr of test 'load_stdin_incorrect_lin # 17:35:33 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=33038 # 17:35:33 > +MAPI = (monetdb) /var/tmp/mtest-17547/.s.monetdb.38582 +QUERY = COPY 2 RECORDS INTO "number" FROM stdin USING DELIMITERS ';', '\n'; + 1 + bla +ERROR = !line 2 field 1 'int' expected in 'bla'. Failed to import table # 17:35:33 > # 17:35:33 > Done. diff --git a/sql/test/copy/Tests/load_stdin_incorrect_line_nr.stable.out b/sql/test/copy/Tests/load_stdin_incorrect_line_nr.stable.out --- a/sql/test/copy/Tests/load_stdin_incorrect_line_nr.stable.out +++ b/sql/test/copy/Tests/load_stdin_incorrect_line_nr.stable.out @@ -31,24 +31,18 @@ Ready. #CREATE TABLE "sys"."number" ( # "isanumber" int #); -#COPY 2 RECORDS INTO "number" FROM stdin USING DELIMITERS ';', '\n'; -#1 -#bla -[ 2 ] #select * from "number"; % sys.number # table_name % isanumber # name % int # type % 1 # length -[ 1 ] -[ NULL ] #drop table "number"; #select * from sys.rejects; % .rejects, .rejects, .rejects, .rejects # table_name % rowid, fldid, message, input # name % bigint, int, clob, clob # type -% 1, 1, 15, 4 # length -[ 1@0, 0, "'int' expected ", "bla\n" ] +% 1, 1, 14, 4 # length +[ 2, 1, "'int' expected", "bla\n" ] # 08:32:32 > # 08:32:32 > "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 @@ -80,9 +80,30 @@ stderr of test 'null_as_string_errors` i # 21:02:57 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=38808 # 21:02:57 > -# 13:10:04 > -# 13:10:04 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=sofia" "--port=38256" -# 13:10:04 > +MAPI = (monetdb) /var/tmp/mtest-17547/.s.monetdb.38582 +QUERY = copy 1 records into null_as_string from stdin delimiters ',','\n' NULL as ''; + NULL,NULL,NULL +ERROR = !line 1 field 1 'int' expected in 'NULL'. Failed to import table +MAPI = (monetdb) /var/tmp/mtest-17547/.s.monetdb.38582 +QUERY = copy 1 records into null_as_string from stdin delimiters ',','\n' NULL as ''; + NULL,zero,0 +ERROR = !line 1 field 1 'int' expected in 'NULL'. Failed to import table +MAPI = (monetdb) /var/tmp/mtest-17547/.s.monetdb.38582 +QUERY = copy 1 records into null_as_string from stdin delimiters ',','\n' NULL as ''; + 2,two,NULL +ERROR = !line 1 field 3 'decimal(5,2)' expected in 'NULL'. Failed to import table +MAPI = (monetdb) /var/tmp/mtest-17547/.s.monetdb.38582 +QUERY = copy 1 records into null_as_string from stdin delimiters ',','\n'; + ,, +ERROR = !line 1 field 1 'int' expected in ''. Failed to import table +MAPI = (monetdb) /var/tmp/mtest-17547/.s.monetdb.38582 +QUERY = copy 1 records into null_as_string from stdin delimiters ',','\n'; + ,zero,0 +ERROR = !line 1 field 1 'int' expected in ''. Failed to import table +MAPI = (monetdb) /var/tmp/mtest-17547/.s.monetdb.38582 +QUERY = copy 1 records into null_as_string from stdin delimiters ',','\n'; + 2,two, +ERROR = !line 1 field 3 'decimal(5,2)' expected in ''. Failed to import table # 08:37:31 > # 08:37:31 > "Done." diff --git a/sql/test/copy/Tests/null_as_string_errors.stable.out b/sql/test/copy/Tests/null_as_string_errors.stable.out --- a/sql/test/copy/Tests/null_as_string_errors.stable.out +++ b/sql/test/copy/Tests/null_as_string_errors.stable.out @@ -30,55 +30,38 @@ Ready. #create table null_as_string (i int, s string, d decimal(5,2)); #copy 1 records into null_as_string from stdin delimiters ',','\n' NULL as ''; -#NULL,NULL,NULL -[ 1 ] -#copy 1 records into null_as_string from stdin delimiters ',','\n' NULL as ''; -#NULL,zero,0 -[ 1 ] -#copy 1 records into null_as_string from stdin delimiters ',','\n' NULL as ''; #1,NULL,1 [ 1 ] -#copy 1 records into null_as_string from stdin delimiters ',','\n' NULL as ''; -#2,two,NULL -[ 1 ] +#select * from null_as_string; % sys.null_as_string, sys.null_as_string, sys.null_as_string # table_name % i, s, d # name % int, clob, decimal # type % 1, 4, 7 # length -[ NULL, "NULL", NULL ] -[ NULL, "zero", 0.00 ] [ 1, "NULL", 1.00 ] -[ 2, "two", NULL ] #delete from null_as_string; -[ 4 ] -#select * from sys.rejects; -% .rejects, .rejects, .rejects, .rejects # table_name -% rowid, fldid, message, input # name -% bigint, int, clob, clob # type -% 1, 1, 24, 15 # length -[ 0@0, 0, "'int' expected ", "NULL,NULL,NULL\n" ] -[ 0@0, 2, "'decimal(5,2)' expected ", "NULL,NULL,NULL\n" ] -[ 0@0, 0, "'int' expected ", "NULL,zero,0\n" ] -[ 0@0, 2, "'decimal(5,2)' expected ", "2,two,NULL\n" ] -#copy 1 records into null_as_string from stdin delimiters ',','\n'; -#,, [ 1 ] #select * from sys.rejects; % .rejects, .rejects, .rejects, .rejects # table_name % rowid, fldid, message, input # name % bigint, int, clob, clob # type -% 1, 1, 24, 3 # length -[ 0@0, 0, "'int' expected ", ",,\n" ] -[ 0@0, 2, "'decimal(5,2)' expected ", ",,\n" ] -#copy 1 records into null_as_string from stdin delimiters ',','\n'; -#,zero,0 -[ 1 ] +% 1, 1, 23, 15 # length +[ 1, 1, "'int' expected", "NULL,NULL,NULL\n" ] +[ 1, 3, "'decimal(5,2)' expected", "NULL,NULL,NULL\n" ] +[ 1, 1, "'int' expected", "NULL,zero,0\n" ] +[ 1, 3, "'decimal(5,2)' expected", "2,two,NULL\n" ] #select * from sys.rejects; % .rejects, .rejects, .rejects, .rejects # table_name % rowid, fldid, message, input # name % bigint, int, clob, clob # type -% 1, 1, 15, 8 # length -[ 0@0, 0, "'int' expected ", ",zero,0\n" ] +% 1, 1, 23, 3 # length +[ 1, 1, "'int' expected", ",,\n" ] +[ 1, 3, "'decimal(5,2)' expected", ",,\n" ] +#select * from sys.rejects; +% .rejects, .rejects, .rejects, .rejects # table_name +% rowid, fldid, message, input # name +% bigint, int, clob, clob # type +% 1, 1, 14, 8 # length +[ 1, 1, "'int' expected", ",zero,0\n" ] #copy 1 records into null_as_string from stdin delimiters ',','\n'; #1,,1 [ 1 ] @@ -87,26 +70,20 @@ Ready. % rowid, fldid, message, input # name % bigint, int, clob, clob # type % 1, 1, 0, 0 # length -#copy 1 records into null_as_string from stdin delimiters ',','\n'; -#2,two, -[ 1 ] #select * from null_as_string; % sys.null_as_string, sys.null_as_string, sys.null_as_string # table_name % i, s, d # name % int, clob, decimal # type -% 1, 4, 7 # length -[ NULL, "", NULL ] -[ NULL, "zero", 0.00 ] +% 1, 0, 7 # length [ 1, "", 1.00 ] -[ 2, "two", NULL ] #delete from null_as_string; -[ 4 ] +[ 1 ] #select * from sys.rejects; % .rejects, .rejects, .rejects, .rejects # table_name % rowid, fldid, message, input # name % bigint, int, clob, clob # type -% 1, 1, 24, 7 # length -[ 0@0, 2, "'decimal(5,2)' expected ", "2,two,\n" ] +% 1, 1, 23, 7 # length +[ 1, 3, "'decimal(5,2)' expected", "2,two,\n" ] #drop table null_as_string; # 08:37:31 > _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
