Test case updates.

FossilOrigin-Name: 27c681c9c6672ad7098d8ff2c41e76d3e9e55866b6327ed85e73f63bd623ceed

diff --git a/manifest b/manifest
index 0d9332c5ccd7b4e4909daf32e7fc925a95bbbf79..af44176f84bede3a7e453f6e6d6e8ac59536e50a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Sometimes\sit\smakes\ssense\sto\sdo\sa\sfull\stable\sscan\srather\sthan\stry\sto\suse\nan\sindex\swhen\smost\sof\sthe\srows\swill\sbe\sselected.\s\sThis\sbranch\sis\strying\sto\ntune\sthe\squery\splanner\sto\smake\sthat\shappen\smore\soften.
-D 2020-10-22T15:47:48.417
+C Test\scase\supdates.
+D 2020-10-22T18:16:17.916
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1362,7 +1362,7 @@ F test/sidedelete.test f0ad71abe6233e3b153100f3b8d679b19a488329
 F test/skipscan1.test ed524bc86f27646b3a297f45d6557b55db338977b6838f8064b196b35848b31b
 F test/skipscan2.test 3eb703ce794f139e7b83567911046298bcde29606116727f9b700ce34f559d2d
 F test/skipscan3.test ec5bab3f81c7038b43450e7b3062e04a198bdbb5
-F test/skipscan5.test 67817a4b6857c47e0e33ba3e506da6f23ef68de2
+F test/skipscan5.test 980875ad45d8aacfe7bdec7c288343520cd1d14e84befdcfe50c785f9e6c8709
 F test/skipscan6.test 0b4cd1b4ac9f84d91454df513c99a4932fa07e8f27b8049bea605068b3e34ac7
 F test/snapshot.test a504f2e7009f512ef66c719f0ea1c55a556bdaf1e1312c80a04d46fc1a3e9632
 F test/snapshot2.test 8d6ff5dd9cc503f6e12d408a30409c3f9c653507b24408d9cd7195931c89bc54
@@ -1728,7 +1728,7 @@ F test/whereC.test cae295158703cb3fc23bf1a108a9ab730efff0f6
 F test/whereD.test c1c335e914e28b122e000e9310f02d2be83e1c9dbca2e29f46bd732703944d1b
 F test/whereE.test b3a055eef928c992b0a33198a7b8dc10eea5ad2f
 F test/whereF.test 3d9412b1199d3e2bed34fcb76b4c48d0bf4df95d27e3f8dd27b6f8b4716d0d89
-F test/whereG.test 9363b2a97d914cb1b81aff5069ef0cf2a071a67e2b604eac6fe9c0114017d9aa
+F test/whereG.test 77127a4d214bb21da3b5c695cf4106cd9e418c60d9c24471ba55d3772067cd35
 F test/whereH.test e4b07f7a3c2f5d31195cd33710054c78667573b2
 F test/whereI.test a2874062140ed4aba9ffae76e6190a3df6fc73d1373fdfa8fd632945082a5364
 F test/whereJ.test 88287550f6ee604422403b053455b1ad894eeaa5c35d348532dfa1439286cb9a
@@ -1883,10 +1883,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 602d7369166d406a26834aa47d71d565a17d377d32e41f308821a50b41f91896
-R ab709a26dfedc74dfc33ed96beba3bb5
-T *branch * avoid-bad-indexes
-T *sym-avoid-bad-indexes *
-T -sym-trunk *
+P 0f42099ad65855c94af8472f3a6fddac7fc2a82e8fdfcc06a298eb6683a28688
+R 095b8371453be15a7f4050e63d8f5ae1
 U drh
-Z cb46159555a32660890058f8ecf1c0c9
+Z 3bc0d725f8d222a4909fbd87d08e48ab

diff --git a/manifest.uuid b/manifest.uuid
index 0a282e6eac9b3637142de99d904bb3ede6bcb5b7..cb9d3e2ade9fdd9de5e74f5e4ab9bd3ccbcd0e11 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0f42099ad65855c94af8472f3a6fddac7fc2a82e8fdfcc06a298eb6683a28688
\ No newline at end of file
+27c681c9c6672ad7098d8ff2c41e76d3e9e55866b6327ed85e73f63bd623ceed
\ No newline at end of file

diff --git a/test/skipscan5.test b/test/skipscan5.test
index 7c3b166a8c2f4fa8da2427194fc97f7410d87beb..c128e614c18f6916cabe2f7b65fcb9a910ff0f0a 100644 (file)
--- a/test/skipscan5.test
+++ b/test/skipscan5.test
@@ -30,7 +30,7 @@ do_execsql_test 1.1 {
 
 expr srand(4)
 do_test 1.2 {
-  for {set i 0} {$i < 100} {incr i} {
+  for {set i 0} {$i < 1000} {incr i} {
     set a [expr int(rand()*4.0) + 1]
     set b [expr int(rand()*20.0) + 1]
     execsql { INSERT INTO t1 VALUES($a, $b, NULL) }
@@ -43,7 +43,7 @@ foreach {tn q res} {
   2  "b > 12 AND b < 16"       {/*ANY(a) AND b>? AND b<?*/}
   3  "b > 2 AND b < 16"        {/*SCAN TABLE t1*/}
   4  "b > 18 AND b < 25"       {/*ANY(a) AND b>? AND b<?*/}
-  5  "b > 15"                  {/*ANY(a) AND b>?*/}
+  5  "b > 16"                  {/*ANY(a) AND b>?*/}
   6  "b > 5"                   {/*SCAN TABLE t1*/}
   7  "b < 15"                  {/*SCAN TABLE t1*/}
   8  "b < 5"                   {/*ANY(a) AND b<?*/}
@@ -52,7 +52,7 @@ foreach {tn q res} {
   11 "b > '12' AND b < '16'"   {/*ANY(a) AND b>? AND b<?*/}
   12 "b > '2' AND b < '16'"    {/*SCAN TABLE t1*/}
   13 "b > '18' AND b < '25'"   {/*ANY(a) AND b>? AND b<?*/}
-  14 "b > '15'"                {/*ANY(a) AND b>?*/}
+  14 "b > '16'"                {/*ANY(a) AND b>?*/}
   15 "b > '5'"                 {/*SCAN TABLE t1*/}
   16 "b < '15'"                {/*SCAN TABLE t1*/}
   17 "b < '5'"                 {/*ANY(a) AND b<?*/}
@@ -108,7 +108,7 @@ foreach {tn dbenc coll} {
     3 { c > 'q' }                     {/*ANY(a) AND ANY(b) AND c>?*/}
     4 { c > 'e' }                     {/*SCAN TABLE t2*/}
     5 { c < 'q' }                     {/*SCAN TABLE t2*/}
-    6 { c < 'c' }                     {/*ANY(a) AND ANY(b) AND c<?*/}
+    6 { c < 'b' }                     {/*ANY(a) AND ANY(b) AND c<?*/}
   } {
     set sql "EXPLAIN QUERY PLAN SELECT * FROM t2 WHERE $q" 
     do_execsql_test 2.$tn.$tn2 $sql $res

diff --git a/test/whereG.test b/test/whereG.test
index c6ae3ce325418f0648d3e4d991e6b8d4e591db58..abff2270b7a1c9e5db0975a2968bc66a167afa03 100644 (file)
--- a/test/whereG.test
+++ b/test/whereG.test
@@ -220,9 +220,15 @@ do_eqp_test 5.2.4 {
   SELECT * FROM t1 WHERE likely(b>?)
 } {SCAN TABLE t1}
 
-do_eqp_test 5.3.1 {
-  SELECT * FROM t1 WHERE a=?
-} {SEARCH TABLE t1 USING INDEX i1 (a=?)}
+ifcapable stat4 {
+  do_eqp_test 5.3.1.stat4 {
+    SELECT * FROM t1 WHERE a=?
+  } {SCAN TABLE t1}
+} else {
+  do_eqp_test 5.3.1 {
+    SELECT * FROM t1 WHERE a=?
+  } {SEARCH TABLE t1 USING INDEX i1}
+}
 do_eqp_test 5.3.2 {
   SELECT * FROM t1 WHERE likelihood(a=?, 0.9)
 } {SCAN TABLE t1}