Changeset: faf7a42a3079 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=faf7a42a3079 Added Files: sql/test/copy/Tests/nonutf8.sql sql/test/copy/Tests/nonutf8.stable.err sql/test/copy/Tests/nonutf8.stable.out Modified Files: sql/test/copy/Tests/All Branch: resultset Log Message:
Add test for non-utf8 input diffs (118 lines): diff --git a/sql/test/copy/Tests/All b/sql/test/copy/Tests/All --- a/sql/test/copy/Tests/All +++ b/sql/test/copy/Tests/All @@ -10,3 +10,4 @@ load_stdin_incorrect_line_nr overflow_error format_date key_copy +nonutf8 diff --git a/sql/test/copy/Tests/nonutf8.sql b/sql/test/copy/Tests/nonutf8.sql new file mode 100644 --- /dev/null +++ b/sql/test/copy/Tests/nonutf8.sql @@ -0,0 +1,14 @@ +-- test resistance against non-UFT8 input + +start transaction; +create table nonutf8 ( s string); +insert into nonutf8 values ('zwaar lange golf piek -dal �10cm vak5'); + +copy 2 records into nonutf8 from stdin; +zwaar lange golf piek -dal �10cm vak5 +�17 % + +select * from nonutf8; + +drop table nonutf8; +rollback; diff --git a/sql/test/copy/Tests/nonutf8.stable.err b/sql/test/copy/Tests/nonutf8.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/copy/Tests/nonutf8.stable.err @@ -0,0 +1,37 @@ +stderr of test 'nonutf8` in directory 'sql/test/copy` itself: + + +# 10:26:04 > +# 10:26:04 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=33851" "--set" "mapi_usock=/var/tmp/mtest-3524/.s.monetdb.33851" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/resultset//Linux/var/MonetDB/mTests_sql_test_copy" "--set" "mal_listing=0" "--set" "embedded_r=yes" +# 10:26:04 > + +# builtin opt gdk_dbpath = /export/scratch1/mk/resultset//Linux/var/monetdb5/dbfarm/demo +# builtin opt gdk_debug = 0 +# builtin opt gdk_vmtrim = no +# builtin opt monet_prompt = > +# builtin opt monet_daemon = no +# builtin opt mapi_port = 50000 +# builtin opt mapi_open = false +# builtin opt mapi_autosense = false +# builtin opt sql_optimizer = default_pipe +# builtin opt sql_debug = 0 +# cmdline opt gdk_nr_threads = 0 +# cmdline opt mapi_open = true +# cmdline opt mapi_port = 33851 +# cmdline opt mapi_usock = /var/tmp/mtest-3524/.s.monetdb.33851 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbpath = /export/scratch1/mk/resultset//Linux/var/MonetDB/mTests_sql_test_copy +# cmdline opt mal_listing = 0 +# cmdline opt embedded_r = yes +# cmdline opt gdk_debug = 536870922 + +# 10:26:04 > +# 10:26:04 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-3524" "--port=33851" +# 10:26:04 > + + +# 10:26:04 > +# 10:26:04 > "Done." +# 10:26:04 > + diff --git a/sql/test/copy/Tests/nonutf8.stable.out b/sql/test/copy/Tests/nonutf8.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/copy/Tests/nonutf8.stable.out @@ -0,0 +1,44 @@ +stdout of test 'nonutf8` in directory 'sql/test/copy` itself: + + +# 10:26:04 > +# 10:26:04 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=33851" "--set" "mapi_usock=/var/tmp/mtest-3524/.s.monetdb.33851" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/resultset//Linux/var/MonetDB/mTests_sql_test_copy" "--set" "mal_listing=0" "--set" "embedded_r=yes" +# 10:26:04 > + +# MonetDB 5 server v11.20.0 +# This is an unreleased version +# Serving database 'mTests_sql_test_copy', using 8 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit integers dynamically linked +# Found 15.590 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved +# Visit http://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://vienna.ins.cwi.nl:33851/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-3524/.s.monetdb.33851 +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded +# MonetDB/R module loaded + +Ready. + +# 10:26:04 > +# 10:26:04 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-3524" "--port=33851" +# 10:26:04 > + +#start transaction; +#create table nonutf8 ( s string); +#insert into nonutf8 values ('zwaar lange golf piek -dal �10cm vak5'); +[ 1 ] +#copy 2 records into nonutf8 from stdin; +#zwaar lange golf piek -dal �10cm vak5 +#�17 % +[ 2 ] +#select * from nonutf8; +#We expect error messages here +#drop table nonutf8; +#rollback; + +# 10:26:04 > +# 10:26:04 > "Done." +# 10:26:04 > + _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list