Fix cut-and-paste error in test file fts4umlaut.test.

FossilOrigin-Name: cad5da1bf5f65ad87d97b72e9a84081fde455ba4085e79943fdf6c0144b1ef83

diff --git a/manifest b/manifest
index 88d8b20e85c8e2829c2a5cb23d4f1f32d9f98c31..95d133ffaf91e028d7d2d95a1b112bc524bc2676 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\sall\sREPLACE\sto\ssneak\sa\sNULL\svalue\sinto\sa\sNOT\sNULL\scolumn.\s\sDetect\sthat\nsituation\sand\sABORT\sinstead.\s\sFix\sfor\sticket\s[e6f1f2e34dceeb1ed61531c7e98].
-D 2018-12-22T01:13:25.766
+C Fix\scut-and-paste\serror\sin\stest\sfile\sfts4umlaut.test.
+D 2018-12-22T07:16:42.310
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in d8b254f8bb81bab43c340d70d17dc3babab40fcc8a348c8255881f780a45fee6
@@ -962,7 +962,7 @@ F test/fts4merge4.test d895b1057a7798b67e03455d0fa50e9ea836c47b
 F test/fts4noti.test 5553d7bb2e20bf4a06b23e849352efc022ce6309
 F test/fts4onepass.test d69ddc4ee3415e40b0c5d1d0408488a87614d4f63ba9c44f3e52db541d6b7cc7
 F test/fts4opt.test 0fd0cc84000743ff2a883b9b84b4a5be07249f0ba790c8848a757164cdd46b2a
-F test/fts4umlaut.test 949e2d9394c89a00ca9493222101cb00c4d0b6d2267c76875605a357c7801eef
+F test/fts4umlaut.test fcaca4471de7e78c9d1f7e8976e3e8704d7d8ad979d57a739d00f3f757380429
 F test/fts4unicode.test ceca76422abc251818cb25dabe33d3c3970da5f7c90e1540f190824e6b3a7c95
 F test/full.test 6b3c8fb43c6beab6b95438c1675374b95fab245d
 F test/func.test 09dda479bcfc568f99f3070413e9672a8eeedc1be9c5d819bf55d4788c2583b7
@@ -1791,7 +1791,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P a3fdb2c78d23b94d68dc08126b22d03152ac6068496a42402cdfb336cd4a7e33
-R 536c60e567985914e454e8d89eab541a
-U drh
-Z 6ca1b40acd2f6e42eedbb7302333ee0e
+P db8d1d12f5c1673404b2afb5426d5ea3afe3b69d01f8f2bc47ffdf70684fdf24
+R 6083c8e473bc24e00f67abe203289608
+U dan
+Z 2da30c5381c54cb5a2481b9acb3505fa

diff --git a/manifest.uuid b/manifest.uuid
index 4f0cda7830792ce4a2001b5d16c034afa76d774e..ea4a76856c4e3b93f1c9e174bdbfdd9302c8cfe5 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-db8d1d12f5c1673404b2afb5426d5ea3afe3b69d01f8f2bc47ffdf70684fdf24
\ No newline at end of file
+cad5da1bf5f65ad87d97b72e9a84081fde455ba4085e79943fdf6c0144b1ef83
\ No newline at end of file

diff --git a/test/fts4umlaut.test b/test/fts4umlaut.test
index 31552b07ce8c702372e0ccc865ddc3d2eb2acc1c..a5a652fb42938d3616c8bc117622bb035477dde2 100644 (file)
--- a/test/fts4umlaut.test
+++ b/test/fts4umlaut.test
@@ -16,13 +16,13 @@ set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 set testprefix fts4umlaut
 
-ifcapable !fts3||!fts5 {
+ifcapable !fts3 {
   finish_test
   return
 }
 
 do_execsql_test 1.0 {
-  CREATE VIRTUAL TABLE t1 USING fts5(x);
+  CREATE VIRTUAL TABLE t1 USING fts4(x, tokenize=unicode61);
   CREATE VIRTUAL TABLE t2 USING fts4(
       x, 
       tokenize=unicode61 "remove_diacritics=2"
@@ -49,12 +49,12 @@ foreach {tn q res1 res2} {
     SELECT count(*) FROM t1 WHERE t1 MATCH 'Ha Noi'
   } $res1
 
-  do_execsql_test 1.$tn.2 {
+  do_execsql_test 1.$tn.3 {
     DELETE FROM t2;
     INSERT INTO t2(rowid, x) VALUES (1, 'Ha Noi');
     SELECT count(*) FROM t2 WHERE t2 MATCH $q
   } $res2
-  do_execsql_test 1.$tn.2 {
+  do_execsql_test 1.$tn.4 {
     DELETE FROM t2;
     INSERT INTO t2(rowid, x) VALUES (1, $q);
     SELECT count(*) FROM t2 WHERE t2 MATCH 'Ha Noi'