Remove an unnecessary conditional from the EXPLAIN QUERY PLAN logic.

FossilOrigin-Name: c5dc83ebded914f07286b7f98d0a50c28c16f609

diff --git a/manifest b/manifest
index d84631e2208f156271b0b0e22e7985895ff25506..b8991f9317e96affda0cc15429a11f52b137d4f7 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Restrict\sthe\sscope\sof\sthe\sexplainIndexRange()\sfunction\sin\swhere.c.
-D 2014-10-10T19:15:35.023
+C Remove\san\sunnecessary\sconditional\sfrom\sthe\sEXPLAIN\sQUERY\sPLAN\slogic.
+D 2014-10-11T01:22:16.169
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -302,7 +302,7 @@ F src/vtab.c 019dbfd0406a7447c990e1f7bd1dfcdb8895697f
 F src/wal.c 10e7de7ce90865a68153f001a61f1d985cd17983
 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
-F src/where.c 75af78b4a4125e891f62d997d6d93b006a8c7d68
+F src/where.c 45202a9a2848848a17b64316fe87bdb5a75f5910
 F src/whereInt.h 124d970450955a6982e174b07c320ae6d62a595c
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@ -1203,7 +1203,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 8541dfb3bbdf63dc9ab304d8a0ab8b290cdc9d96
-R 56927b83c6bc9f8ed8f382263f0b3a19
+P c30124520027f0f860223bf842e2f09db3dafb5f
+R 76a395c9de317da89295170f9596fa71
 U drh
-Z 9069bb5e423e6471fadcdc96cb083909
+Z efd3e7a68804083aa9d3740b204464db

diff --git a/manifest.uuid b/manifest.uuid
index ced410d581090e4b550806f2eadca1040baa76b5..e90d20a6354b815338cbb7d67ac07c47730bad8d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c30124520027f0f860223bf842e2f09db3dafb5f
\ No newline at end of file
+c5dc83ebded914f07286b7f98d0a50c28c16f609
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index bd59055b4af6f5ce65051e2004c5e363db96f112..4aa208d2eef7a854f96b7eb6f61702026c34f787 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -2838,9 +2838,7 @@ static void explainOneScan(
       pIdx = pLoop->u.btree.pIndex;
       assert( !(flags&WHERE_AUTO_INDEX) || (flags&WHERE_IDX_ONLY) );
       if( !HasRowid(pItem->pTab) && IsPrimaryKeyIndex(pIdx) ){
-        if( pLoop->u.btree.nEq>0
-         || (pLoop->wsFlags & (WHERE_BTM_LIMIT|WHERE_TOP_LIMIT))!=0
-        ){
+        if( isSearch ){
           zFmt = "PRIMARY KEY";
         }
       }else if( flags & WHERE_AUTO_INDEX ){