Add a test for fts4 unicode61 option remove_diacritics=0.

FossilOrigin-Name: 6bf7ae6ff6b18712544ddeafb6848b3b27ff22d2

diff --git a/manifest b/manifest
index dcc9ba19af1b844beaab3b8c843cdc4e22281cf5..5c27035d7444b0832741aefcde79601d4e6a457b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improvements\sto\sthe\srobust_open()\slogic\sin\sthe\sunix\sVFS\sso\sthat\sif\san\sattempt\nis\smade\sto\sopen\sa\srepository\son\sfile\sdescriptors\s0,\s1,\sor\s2,\sand\sblocking\nthat\sfile\sdescriptor\sby\sopening\sit\son\s/dev/null\sfails,\sthen\sthe\sopen\swill\nfail.
-D 2013-08-30T06:20:23.091
+C Add\sa\stest\sfor\sfts4\sunicode61\soption\sremove_diacritics=0.
+D 2013-08-30T13:29:51.754
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -557,7 +557,7 @@ F test/fts4merge2.test 5faa558d1b672f82b847d2a337465fa745e46891
 F test/fts4merge3.test aab02a09f50fe6baaddc2e159c3eabc116d45fc7
 F test/fts4merge4.test c19c85ca1faa7b6d536832b49c12e1867235f584
 F test/fts4noti.test aed33ba44808852dcb24bf70fa132e7bf530f057
-F test/fts4unicode.test c8ac44217bf6c17812b03eaafa6c06995ad304c2
+F test/fts4unicode.test 5fa8e0a7899d906d114345c605250ebfa9d8ed28
 F test/full.test 6b3c8fb43c6beab6b95438c1675374b95fab245d
 F test/func.test cd25cf605c5a345d038dc7b84232204c6a901c84
 F test/func2.test 772d66227e4e6684b86053302e2d74a2500e1e0f
@@ -1109,7 +1109,7 @@ F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P 30d38cc44904d93508b87e373b2f45d5f93e556b
-R f7758c6eac86fc614b8a8bb0a78752f4
-U drh
-Z 3dd4af0a8c411dcbaa133c8880e5be77
+P d9c018f8155ab48df8e0e02519bba50588fe49fc
+R ea091c59207c769dfe7c01daedbc5f93
+U dan
+Z c2684be8ef49bf7c2f428934c35768a0

diff --git a/manifest.uuid b/manifest.uuid
index 70f0bca9ead424f9801d0e642339f3f71e542e39..47941bce42135a263afb5e6331516b8672d64682 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d9c018f8155ab48df8e0e02519bba50588fe49fc
\ No newline at end of file
+6bf7ae6ff6b18712544ddeafb6848b3b27ff22d2
\ No newline at end of file

diff --git a/test/fts4unicode.test b/test/fts4unicode.test
index aee7f05b1b771bea63fb312fa9f0f4a5f2fa0672..8149bb172d731f313a6a8fe87bf43e5ff5f7de56 100644 (file)
--- a/test/fts4unicode.test
+++ b/test/fts4unicode.test
@@ -402,5 +402,40 @@ foreach {tn1 c} {
   }
 }
 
+#-------------------------------------------------------------------------
+# Cursory test of remove_diacritics=0.
+#
+# 00C4;LATIN CAPITAL LETTER A WITH DIAERESIS
+# 00D6;LATIN CAPITAL LETTER O WITH DIAERESIS
+# 00E4;LATIN SMALL LETTER A WITH DIAERESIS
+# 00F6;LATIN SMALL LETTER O WITH DIAERESIS
+#
+do_execsql_test 8.1.1 "
+  CREATE VIRTUAL TABLE t3 USING fts4(tokenize=unicode61 'remove_diacritics=1');
+  INSERT INTO t3 VALUES('o');
+  INSERT INTO t3 VALUES('a');
+  INSERT INTO t3 VALUES('O');
+  INSERT INTO t3 VALUES('A');
+  INSERT INTO t3 VALUES('\xD6');
+  INSERT INTO t3 VALUES('\xC4');
+  INSERT INTO t3 VALUES('\xF6');
+  INSERT INTO t3 VALUES('\xE4');
+"
+do_execsql_test 8.1.2 {
+  SELECT rowid FROM t3 WHERE t3 MATCH 'o';
+} {1 3 5 7}
+do_execsql_test 8.1.3 {
+  SELECT rowid FROM t3 WHERE t3 MATCH 'a';
+} {2 4 6 8}
+do_execsql_test 8.2.1 {
+  CREATE VIRTUAL TABLE t4 USING fts4(tokenize=unicode61 "remove_diacritics=0");
+  INSERT INTO t4 SELECT * FROM t3;
+}
+do_execsql_test 8.2.2 {
+  SELECT rowid FROM t4 WHERE t4 MATCH 'o';
+} {1 3}
+do_execsql_test 8.2.3 {
+  SELECT rowid FROM t4 WHERE t4 MATCH 'a';
+} {2 4}
 
 finish_test