Fix a test script problem causing a test to fail if the ICU extension is enabled.

FossilOrigin-Name: 0c228f5d3db1be598ebf5d9170428c19d18e01ad

diff --git a/manifest b/manifest
index 2ae741da5752b5679423e459721efea8d1fdfd9c..72d4af2b3975db6cddbe15cbef4051c5cf5b0042 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\smemory\sleak\sin\srecently\sadded\stest\scode.
-D 2016-07-06T09:19:14.702
+C Fix\sa\stest\sscript\sproblem\scausing\sa\stest\sto\sfail\sif\sthe\sICU\sextension\sis\senabled.
+D 2016-07-06T10:17:43.607
 F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
@@ -529,7 +529,7 @@ F test/badutf2.test f5bc7f2d280670ecd79b9cf4f0f1760c607fe51f
 F test/bc_common.tcl b5e42d80305be95697e6370e015af571e5333a1c
 F test/bestindex1.test 0cf1bd2d7b97d3a3a8c10736125274f64765c4ee
 F test/bestindex2.test 4a06b8922ab2fd09434870da8d1cdf525aaf7060
-F test/bestindex3.test b80da904d23581d233a7ceee7d6bbad2b23a8133
+F test/bestindex3.test dd5fa4f483cd0356549203c4522f8c9e21cb1fc0
 F test/between.test 34d375fb5ce1ae283ffe82b6b233e9f38e84fc6c
 F test/bigfile.test aa74f4e5db51c8e54a1d9de9fa65d01d1eb20b59
 F test/bigfile2.test 1b489a3a39ae90c7f027b79110d6b4e1dbc71bfc
@@ -1504,7 +1504,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 2683b375ad1291172fdb47d94e16fcf869c78c8a
-R bad3fed306e6177658099344318135b4
+P 724e4cdc25fc80b8face57b3398cd338994fb23c
+R c62c8dbad784e0483dfc9fa19c59eefb
 U dan
-Z b779329b8bc265169140036a21a84f9f
+Z a917ae810e6e02aa96317b48ea0e74c6

diff --git a/manifest.uuid b/manifest.uuid
index 457a7b2b761edca5946ad5be43cf2057034ccfdf..37cc004d3526ddb7e17be83f59c68d15f3c9036e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-724e4cdc25fc80b8face57b3398cd338994fb23c
\ No newline at end of file
+0c228f5d3db1be598ebf5d9170428c19d18e01ad
\ No newline at end of file

diff --git a/test/bestindex3.test b/test/bestindex3.test
index bb6d5cefd1a7075d2950c34a0c3c613506f614b9..8baf854254fe7da7cc9f0f3a9d14cad4319bb829 100644 (file)
--- a/test/bestindex3.test
+++ b/test/bestindex3.test
@@ -135,17 +135,22 @@ foreach omit {0 1} {
 #-------------------------------------------------------------------------
 # Test the same pattern works with ordinary tables.
 #
-do_execsql_test 2.1 {
-  CREATE TABLE t2(x TEXT COLLATE nocase, y TEXT);
-  CREATE INDEX t2x ON t2(x COLLATE nocase);
-  CREATE INDEX t2y ON t2(y);
-}
+# This test does not work if the ICU extension is enabled. ICU overrides
+# LIKE - and this optimization only works with the built-in LIKE function.
+#
+ifcapable !icu {
+  do_execsql_test 2.1 {
+    CREATE TABLE t2(x TEXT COLLATE nocase, y TEXT);
+    CREATE INDEX t2x ON t2(x COLLATE nocase);
+    CREATE INDEX t2y ON t2(y);
+  }
 
-do_eqp_test 2.2 {
-  SELECT * FROM t2 WHERE x LIKE 'abc%' OR y = 'def'
-} {
-  0 0 0 {SEARCH TABLE t2 USING INDEX t2x (x>? AND x<?)}
-  0 0 0 {SEARCH TABLE t2 USING INDEX t2y (y=?)}
+  do_eqp_test 2.2 {
+    SELECT * FROM t2 WHERE x LIKE 'abc%' OR y = 'def'
+  } {
+    0 0 0 {SEARCH TABLE t2 USING INDEX t2x (x>? AND x<?)}
+    0 0 0 {SEARCH TABLE t2 USING INDEX t2y (y=?)}
+  }
 }
 
 #-------------------------------------------------------------------------