Changeset: a2558db29adc for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/a2558db29adc
Modified Files:
monetdb5/modules/atoms/Tests/asciify.test
monetdb5/modules/atoms/str.c
monetdb5/modules/kernel/Tests/batstr_asciify.test
Branch: txtsim-imp
Log Message:
Fix/improve test of asciify fun that involves iconv lib.
diffs (121 lines):
diff --git a/monetdb5/modules/atoms/Tests/asciify.test
b/monetdb5/modules/atoms/Tests/asciify.test
--- a/monetdb5/modules/atoms/Tests/asciify.test
+++ b/monetdb5/modules/atoms/Tests/asciify.test
@@ -1,24 +1,71 @@
+onlyif system=Linux
query T
select asciify('Olá Mundo!');
----
Ola Mundo!
+onlyif system=Linux
+query T
+select asciify('João');
+----
+Joao
+
+onlyif system=Linux
+query T
+select asciify('Parabéns Ri!');
+----
+Parabens Ri!
+
+onlyif system=Linux
+query T
+select asciify('Müller');
+----
+Muller
+
+onlyif system=Linux
query T
select asciify('こんにちは、世界！');
----
????????!
+onlyif system=Linux
query T
select asciify('Καλημέρα κόσμε!');
----
????u??? ???u?!
+onlyif system=Linux
query T
select asciify('Привет, мир!');
----
??????, ???!
+onlyif system=Linux
query T
select asciify('你好，世界!');
----
??,??!
+
+skipif system=Linux
+query T
+select asciify('Olá Mundo!');
+----
+Ol'a Mundo!
+
+skipif system=Linux
+query T
+select asciify('João');
+----
+Jo~ao
+
+skipif system=Linux
+query T
+select asciify('Parabéns Ri!');
+----
+Parab'ens Ri!
+
+skipif system=Linux
+query T
+select asciify('Müller');
+----
+M"uller
diff --git a/monetdb5/modules/atoms/str.c b/monetdb5/modules/atoms/str.c
--- a/monetdb5/modules/atoms/str.c
+++ b/monetdb5/modules/atoms/str.c
@@ -4995,7 +4995,7 @@ STRasciify(str *r, const str *s)
return MAL_SUCCEED;
}
iconv_t cd;
- const str f = "UTF8", t = "ASCII//TRANSLIT";
+ const str f = "UTF-8", t = "ASCII//TRANSLIT";
str in = *s, out;
size_t in_len = strlen(in), out_len = in_len * 4; /* oversized as a
single utf8 char could change into multiple
ascii char */
diff --git a/monetdb5/modules/kernel/Tests/batstr_asciify.test
b/monetdb5/modules/kernel/Tests/batstr_asciify.test
--- a/monetdb5/modules/kernel/Tests/batstr_asciify.test
+++ b/monetdb5/modules/kernel/Tests/batstr_asciify.test
@@ -18,16 +18,25 @@ statement ok
create table bar(y string);
statement ok
-insert into bar values ('Olá Mundo!'),('こんにちは、世界！'),('Καλημέρα
κόσμε!'),('Привет, мир!'),('你好，世界!')
+insert into bar values ('Olá Mundo!'),('João'),('Parabéns Ri!'),('Müller')
+onlyif system=Linux
query T
select asciify(y) from bar;
----
Ola Mundo!
-????????!
-????u??? ???u?!
-??????, ???!
-??,??!
+Joao
+Parabens Ri!
+Muller
+
+skipif system=Linux
+query T
+select asciify(y) from bar;
+----
+Ol'a Mundo!
+Jo~ao
+Parab'ens Ri!
+M"uller
statement ok
drop table bar;
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
