Add tests for the change on this branch.

FossilOrigin-Name: 7cb697f82932a2581af69350117a29c9c8a2544f

diff --git a/manifest b/manifest
index 48234554f04e9415887cf7c5b2849b7ed9160d58..b6defac38e37fc7e4402a26a3cb8022b7febad16 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Different\scomment\son\sthe\salternative\scursor\sfields\sof\sVdbeCursor.
-D 2016-01-29T20:58:40.189
+C Add\stests\sfor\sthe\schange\son\sthis\sbranch.
+D 2016-01-29T21:16:13.360
 F Makefile.in 027c1603f255390c43a426671055a31c0a65fdb4
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 72b7858f02017611c3ac1ddc965251017fed0845
@@ -1334,7 +1334,7 @@ F test/where9.test 729c3ba9b47e8f9f1aab96bae7dad2a524f1d1a2
 F test/whereA.test 4d253178d135ec46d1671e440cd8f2b916aa6e6b
 F test/whereB.test 0def95db3bdec220a731c7e4bec5930327c1d8c5
 F test/whereC.test cae295158703cb3fc23bf1a108a9ab730efff0f6
-F test/whereD.test 4b648b4a75911474b7b4dde08a7411b165e3fa39
+F test/whereD.test 51366b07cb6f546cd30cc803f7e754f063b940de
 F test/whereE.test b3a055eef928c992b0a33198a7b8dc10eea5ad2f
 F test/whereF.test 5b2ba0dbe8074aa13e416b37c753991f0a2492d7
 F test/whereG.test dde4c52a97385a55be6a7cd46be8373f0cf35501
@@ -1422,7 +1422,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P a323ac3a9d42bd5cb38d724c7e1180584b91054c
-R 2723ccd4873b2c7d653d59caf129ff2b
-U drh
-Z c70856a82eab5a5a2e181cbd70b2aa42
+P 6e3dcb6d7d960bb513d9a4a002b6cf5ab7159686
+R 56d45fd4fdb64a9d12152455ff1bc2b7
+U dan
+Z 8c3eb3de3f58e27647eefba9e15f6f8b

diff --git a/manifest.uuid b/manifest.uuid
index 5612aca8d648f4a91937eb0e5408707ee7c6e669..c7e676919d601db5459cc379654213e52998d81a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6e3dcb6d7d960bb513d9a4a002b6cf5ab7159686
\ No newline at end of file
+7cb697f82932a2581af69350117a29c9c8a2544f
\ No newline at end of file

diff --git a/test/whereD.test b/test/whereD.test
index 1d70103a70ed7bf888d4bb259efce2825fc4d286..de0f9618d2245e56e0abd7e6295936defb78f55f 100644 (file)
--- a/test/whereD.test
+++ b/test/whereD.test
@@ -301,4 +301,40 @@ do_searchcount_test 6.3.3 {
   SELECT rowid FROM x1 WHERE a=1 OR b=10;
 } {1 3 search 4}
 
+do_searchcount_test 6.4.1 {
+  SELECT a FROM x1 WHERE b BETWEEN 1 AND 4 OR c BETWEEN 8 AND 12
+} {1 9 search 6}
+do_searchcount_test 6.4.2 {
+  SELECT b, c FROM x1 WHERE b BETWEEN 1 AND 4 OR c BETWEEN 8 AND 12
+} {2 3 10 11 search 5}
+do_searchcount_test 6.4.3 {
+  SELECT rowid, c FROM x1 WHERE b BETWEEN 1 AND 4 OR c BETWEEN 8 AND 12
+} {1 3 3 11 search 4}
+
+do_searchcount_test 6.5.1 {
+  SELECT a FROM x1 WHERE rowid = 2 OR c=11
+} {5 9 search 3}
+do_searchcount_test 6.5.2 {
+  SELECT d FROM x1 WHERE rowid = 2 OR c=11
+} {8 12 search 2}
+do_searchcount_test 6.5.3 {
+  SELECT d FROM x1 WHERE c=11 OR rowid = 2
+} {12 8 search 2}
+do_searchcount_test 6.5.4 {
+  SELECT a FROM x1 WHERE c=11 OR rowid = 2 
+} {9 5 search 3}
+
+do_searchcount_test 6.6.1 {
+  SELECT rowid FROM x1 WHERE a=1 OR b=6 OR c=11
+} {1 2 3 search 6}
+do_searchcount_test 6.6.2 {
+  SELECT c FROM x1 WHERE a=1 OR b=6 OR c=11
+} {3 7 11 search 7}
+do_searchcount_test 6.6.3 {
+  SELECT c FROM x1 WHERE c=11 OR a=1 OR b=6 
+} {11 3 7 search 7}
+do_searchcount_test 6.6.4 {
+  SELECT c FROM x1 WHERE b=6 OR c=11 OR a=1
+} {7 11 3 search 7}
+
 finish_test