Changeset: 97659df448d4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=97659df448d4
Modified Files:
sql/test/copy/Tests/nonutf8.sql
sql/test/copy/Tests/nonutf8.stable.err
sql/test/copy/Tests/nonutf8.stable.out
Branch: Jul2015
Log Message:
When testing non-UTF-8, it helps to have non-UTF-8 characters. ;-)
diffs (106 lines):
diff --git a/sql/test/copy/Tests/nonutf8.sql b/sql/test/copy/Tests/nonutf8.sql
--- a/sql/test/copy/Tests/nonutf8.sql
+++ b/sql/test/copy/Tests/nonutf8.sql
@@ -2,11 +2,11 @@
start transaction;
create table nonutf8 ( s string);
-insert into nonutf8 values ('zwaar lange golf piek -dal �10cm vak5');
+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 %
+zwaar lange golf piek -dal ±10cm vak5
+±17 %
select * from nonutf8;
diff --git a/sql/test/copy/Tests/nonutf8.stable.err
b/sql/test/copy/Tests/nonutf8.stable.err
--- a/sql/test/copy/Tests/nonutf8.stable.err
+++ b/sql/test/copy/Tests/nonutf8.stable.err
@@ -1,11 +1,11 @@
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 >
+# 15:39:56 >
+# 15:39:56 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31776" "--set"
"mapi_usock=/var/tmp/mtest-2478/.s.monetdb.31776" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/sjoerd/Monet-candidate/var/MonetDB/mTests_sql_test_copy"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 15:39:56 >
-# builtin opt gdk_dbpath =
/export/scratch1/mk/resultset//Linux/var/monetdb5/dbfarm/demo
+# builtin opt gdk_dbpath =
/home/sjoerd/Monet-candidate/var/monetdb5/dbfarm/demo
# builtin opt gdk_debug = 0
# builtin opt gdk_vmtrim = no
# builtin opt monet_prompt = >
@@ -17,21 +17,40 @@ stderr of test 'nonutf8` in directory 's
# 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 mapi_port = 31776
+# cmdline opt mapi_usock = /var/tmp/mtest-2478/.s.monetdb.31776
# 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 gdk_dbpath =
/home/sjoerd/Monet-candidate/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 >
+# 15:39:57 >
+# 15:39:57 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-2478" "--port=31776"
+# 15:39:57 >
+MAPI = (monetdb) /var/tmp/mtest-2478/.s.monetdb.31776
+QUERY = 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 %
+ERROR = !invalid start of UTF-8 sequence
+MAPI = (monetdb) /var/tmp/mtest-2478/.s.monetdb.31776
+QUERY = 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;
+ERROR = !current transaction is aborted (please ROLLBACK)
+MAPI = (monetdb) /var/tmp/mtest-2478/.s.monetdb.31776
+QUERY = drop table nonutf8;
+ERROR = !current transaction is aborted (please ROLLBACK)
-# 10:26:04 >
-# 10:26:04 > "Done."
-# 10:26:04 >
+# 15:39:57 >
+# 15:39:57 > "Done."
+# 15:39:57 >
diff --git a/sql/test/copy/Tests/nonutf8.stable.out
b/sql/test/copy/Tests/nonutf8.stable.out
--- a/sql/test/copy/Tests/nonutf8.stable.out
+++ b/sql/test/copy/Tests/nonutf8.stable.out
@@ -27,15 +27,6 @@ Ready.
#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 >
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
