Fix a problem causing non-covered WHERE terms to be evaluated before covered

WHERE terms.

FossilOrigin-Name: 7d3cb39f60951dcec1ff87da2c4ec998f993de5edf49ee5e5f480c6fe4e5a052

diff --git a/manifest b/manifest
index 687a233e79b6c6b059f5295ad86f2648058ef9ca..07340e2948f0c50ff640d1e13a6eecd00260b629 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C When\stesting\snon-indexed\sWHERE\sconstraints,\stest\sthose\sthat\sinvolve\ncorrelated\ssub-queries\slast\sof\sall.\sThis\sincreases\sthe\schances\sof\snot\shaving\nto\srun\sthe\ssub-query\sat\sall.
-D 2017-07-10T14:33:00.503
+C Fix\sa\sproblem\scausing\snon-covered\sWHERE\sterms\sto\sbe\sevaluated\sbefore\scovered\nWHERE\sterms.
+D 2017-07-10T14:39:42.059
 F Makefile.in 081e48dfe7f995d57ce1a88ddf4d2917b4349158648a6cd45b42beae30de3a12
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 20850e3e8d4d4791e0531955852d768eb06f24138214870d543abb1a47346fba
@@ -531,7 +531,7 @@ F src/wal.h 06b2a0b599cc0f53ea97f497cf8c6b758c999f71
 F src/walker.c a7ca64ce08a83a20d32186fbe06bca9234e348cfcf07959ee322fdc3e8a6173a
 F src/where.c e7cc80943459ade4ccaeb5c7c10f8a0db8b797e0b0f2509de7efc557b76bf7b6
 F src/whereInt.h 2a4b634d63ce488b46d4b0da8f2eaa8f9aeab202bc25ef76f007de5e3fba1f20
-F src/wherecode.c 3eb2130872cb2c570b519dcb7fe34d2bfd1d515292c5131874e797044f8ef832
+F src/wherecode.c 39bddb38a402acf4c191f4a6e69b37d0deb18bbfd01b28ab433653b7a91d7ef4
 F src/whereexpr.c fa51927cc6830b9d3155cafa4e589452ec023fe313a56550d2079dca6c52fbd8
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
@@ -1628,10 +1628,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 dc857a96b00f13ffdf77bc222bc5acbbe14a36ca51e5368b568b3177d1be737a
-R 2c3079a102d9ba8d31221f8f910d8428
-T *branch * defer-where-subqueries
-T *sym-defer-where-subqueries *
-T -sym-trunk *
+P 1f9c1f359e4693954ba7e2bc7b172ef34eb046e4ca2796df8336975b9d6aa92b
+R 053f7bb60ad55030babe7702fd1ffbbc
 U dan
-Z 903fd4acf5ba1f2541b4e3fb6b879043
+Z 736dda2988ee033d8b53d1cbdc026654

diff --git a/manifest.uuid b/manifest.uuid
index d520ade2d9752d0feb23f80f269e0175ce53adb0..407d6ba990bb10a6d0db34914eb49a952a26ce40 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1f9c1f359e4693954ba7e2bc7b172ef34eb046e4ca2796df8336975b9d6aa92b
\ No newline at end of file
+7d3cb39f60951dcec1ff87da2c4ec998f993de5edf49ee5e5f480c6fe4e5a052
\ No newline at end of file

diff --git a/src/wherecode.c b/src/wherecode.c
index beeb1924d6e053afb062dccd83fb240b7cc7e3e2..f9c29e0f04c2612412a800256f4b4cfcc108be95 100644 (file)
--- a/src/wherecode.c
+++ b/src/wherecode.c
@@ -2057,7 +2057,7 @@ Bitmask sqlite3WhereCodeOneLoopStart(
         continue;
       }
       
-      if( iNext==1 && !sqlite3ExprCoveredByIndex(pE, pLevel->iTabCur, pIdx) ){
+      if( iLoop==1 && !sqlite3ExprCoveredByIndex(pE, pLevel->iTabCur, pIdx) ){
         iNext = 2;
         continue;
       }