Restore the ability to do a BETWEEN query on the rowid. Also fix a

nearby comment.

FossilOrigin-Name: 459a7b9068310b36fed950940d251c4b798ffc58

diff --git a/manifest b/manifest
index d0d1a72243b169b11094a067b09ecf065a22ce36..1780bda7cd24e51f162f8d5a24e3e2adb3a7b8ff 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\sthe\sMIN()\sand\sMAX()\smacros\savailable\sin\ssqliteInt.h.\s\sAdd\sTUNING\ncomments\sto\sthe\sNGQP\sand\sadjust\scosts\sslightly.
-D 2013-06-13T15:16:53.047
+C Restore\sthe\sability\sto\sdo\sa\sBETWEEN\squery\son\sthe\srowid.\s\sAlso\sfix\sa\nnearby\scomment.
+D 2013-06-13T15:50:59.429
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -289,7 +289,7 @@ F src/vtab.c b05e5f1f4902461ba9f5fc49bb7eb7c3a0741a83
 F src/wal.c 436bfceb141b9423c45119e68e444358ee0ed35d
 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 F src/walker.c 4fa43583d0a84b48f93b1e88f11adf2065be4e73
-F src/where.c 2e8e0a18dcef3a56a5874a33ba5ec4339f6911ce
+F src/where.c 82b519b79e4efc45461f6ce3990292c01b5adfdd
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6
@@ -1095,7 +1095,7 @@ F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P b5ca80d924f8c6d31f036247ba6e20d234f4482e
-R 224bd6bce7ee1e3846617c8c2c148fe1
+P 3a72af2a95b04b8e195ef17cb3e9d9021a4f0915
+R 1257e951bd26adefbb24e4a4d17e2b37
 U drh
-Z df43f94251ce9f1e894782fd34764619
+Z e1ac17bd2fbb6e506f40edf419e837ee

diff --git a/manifest.uuid b/manifest.uuid
index b4af3a878519c058af70e54e0c9355dd7096bdb8..fe466582660b877045008d4265d6298a6233c832 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3a72af2a95b04b8e195ef17cb3e9d9021a4f0915
\ No newline at end of file
+459a7b9068310b36fed950940d251c4b798ffc58
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index 000df0e107de6dd2250c3902d21a0cb0c91637a6..14bbf88a5b62e19150b9aa98c5e52405ad2d1d16 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -4345,8 +4345,7 @@ static int whereLoopAddBtreeIndex(
     /* TBD: Adjust nOut for additional constraints */
     rc = whereLoopInsert(pBuilder, pNew);
     if( (pNew->wsFlags & WHERE_TOP_LIMIT)==0
-     && pNew->u.btree.nEq<=pProbe->nColumn
-     && pProbe->zName!=0
+     && pNew->u.btree.nEq<(pProbe->nColumn + (pProbe->zName!=0))
     ){
       whereLoopAddBtreeIndex(pBuilder, pSrc, pProbe, nInMul+nIn);
     }