From: dan <dan@noemail.net>
Date: Sat, 15 Jul 2017 06:35:15 +0000 (+0000)
Subject: Fix test problems causing the "prepare" permutation test to fail.
X-Git-Tag: version-3.20.0~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a50b309187aa9d87c8cb7509876593aa123fe2b2;p=thirdparty%2Fsqlite.git

Fix test problems causing the "prepare" permutation test to fail.

FossilOrigin-Name: b61cc5a0f9f2c2d2175ad30fc3fa4cb2086dbb948d5a5cc538ac43b871bb5221
---

diff --git a/manifest b/manifest
index 4487175c7d..baa5d68390 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\stest\sproblems\swith\sstmtvtab1.test\sunder\ssome\spermutations.
-D 2017-07-14T20:53:21.369
+C Fix\stest\sproblems\scausing\sthe\s"prepare"\spermutation\stest\sto\sfail.
+D 2017-07-15T06:35:15.061
 F Makefile.in eda8bedf08c4c93e2137ef1218b3d3302488c68c2774918de0335a1133aab157
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 20850e3e8d4d4791e0531955852d768eb06f24138214870d543abb1a47346fba
@@ -976,7 +976,7 @@ F test/keyword1.test 37ef6bba5d2ed5b07ecdd6810571de2956599dff
 F test/kvtest.c d2b8cfc91047ebf6cac4f3a04f19c3a864e4ecfd683bbb65c395df450b8dc79c
 F test/lastinsert.test 42e948fd6442f07d60acbd15d33fb86473e0ef63
 F test/laststmtchanges.test ae613f53819206b3222771828d024154d51db200
-F test/like.test e7b1e724c731a219c4338e37cfe2c5861cd1cd7a856bbdd1d6045ae4f83dc7c7
+F test/like.test 7c649e82a50d29505e151a3b9a28260df5fe098abf02c153bead28cc2877b095
 F test/like2.test 3b2ee13149ba4a8a60b59756f4e5d345573852da
 F test/like3.test 3608a2042b6f922f900fbfd5d3ce4e7eca57f7c4
 F test/limit.test 0c99a27a87b14c646a9d583c7c89fd06c352663e
@@ -1085,7 +1085,7 @@ F test/parser1.test 391b9bf9a229547a129c61ac345ed1a6f5eb1854
 F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
 F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
 F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
-F test/permutations.test 1e1065e4d6ae99352d48765dabbab5d048d6ee4e7f7cfed6baef843d39bd13c2
+F test/permutations.test 5e2e5439642898e0947ced066ad09b82bd817ddfb83dc71291b4c957efc84b62
 F test/pragma.test f274259d6393b6681eb433beb8dd39a26ec06a4431052a4880b43b84912a3f58
 F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f
 F test/pragma3.test 14c12bc5352b1e100e0b6b44f371053a81ccf8ed
@@ -1633,7 +1633,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 65f9f29c58f61646d700eee6610ce85b572306f0ce2f19bebfd37632523019e5
-R 1b4827c3843d28640d55045bca8d7324
+P ad6699d476b93131887e30475517764e281647f94df4a8248e2b88f1f14da91d
+R 9dfbbe963743d0e2eef7d829beebbfc7
 U dan
-Z 3a1a049c3c93c2a8bbcf4e58ac15c1ef
+Z b0b2b821a8a44e601b1e02dc4281054a
diff --git a/manifest.uuid b/manifest.uuid
index a65fd0f6f0..9ef9f0715d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ad6699d476b93131887e30475517764e281647f94df4a8248e2b88f1f14da91d
\ No newline at end of file
+b61cc5a0f9f2c2d2175ad30fc3fa4cb2086dbb948d5a5cc538ac43b871bb5221
\ No newline at end of file
diff --git a/test/like.test b/test/like.test
index e07b4e0603..3a8d649164 100644
--- a/test/like.test
+++ b/test/like.test
@@ -213,17 +213,23 @@ do_test like-3.3.101 {
 
 # The like optimization works even when the pattern is a bound parameter
 #
-do_test like-3.3.102 {
-  set sqlite_like_count 0
-  unset -nocomplain ::likepat
-  set ::likepat abc%
-  queryplan {
-    SELECT x FROM t1 WHERE x LIKE $::likepat ORDER BY 1;
-  }
-} {abc abcd nosort {} i1}
-do_test like-3.3.103 {
-  set sqlite_like_count
-} 0
+# Exception: It does not work if sqlite3_prepare() is used instead of
+# sqlite3_prepare_v2(), as in that case the statement cannot be reprepared
+# after the parameter is bound.
+#
+set ::likepat abc%
+if {[permutation]!="prepare"} {
+  do_test like-3.3.102 {
+    set sqlite_like_count 0
+    unset -nocomplain ::likepat
+    queryplan {
+      SELECT x FROM t1 WHERE x LIKE $::likepat ORDER BY 1;
+    }
+  } {abc abcd nosort {} i1}
+  do_test like-3.3.103 {
+    set sqlite_like_count
+  } 0
+}
 
 # Except, the like optimization does not work for bound parameters if
 # the query planner stability guarantee is active.
diff --git a/test/permutations.test b/test/permutations.test
index 068bef9367..59e30b5198 100644
--- a/test/permutations.test
+++ b/test/permutations.test
@@ -1048,7 +1048,8 @@ test_suite "prepare" -description {
   db_use_legacy_prepare $::dbhandle 1
   #$::dbhandle cache size 0
 } -files [
-  test_set $allquicktests -exclude *malloc* *ioerr* *fault* stmtvtab1.test
+  test_set $allquicktests -exclude *malloc* *ioerr* *fault* \
+      stmtvtab1.test index9.test
 ]
 
 # End of tests