Fix a display issue with EXPLAIN QUERY PLAN.

FossilOrigin-Name: ff2fa407558360f2499b6df0392ab3cdb4788dec

diff --git a/manifest b/manifest
index 3b65c600a9281cc100078f832cf4b72fb154fed3..5e757202a771ca95770431c96ec7a5d4bdf93ecb 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Refactor\sthe\sORDER\sBY\soptimizer\sin\sthe\sNGQP\sso\sthat\sit\sis\seasier\sto\smaintain\nand\sso\sthat\sit\scan\ssupport\soptimizing\sout\sGROUP\sBY\sand\sDISTINCT\sclauses.
-D 2013-06-04T12:42:29.293
+C Fix\sa\sdisplay\sissue\swith\sEXPLAIN\sQUERY\sPLAN.
+D 2013-06-04T12:58:02.050
 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 cca3284b915ee9c51dd9188e3a74e648ddf3db47
+F src/where.c 89e9e0180fb061529c2335483e698461020008b3
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6
@@ -1093,7 +1093,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P eb27086e8a8a4d5fcb2ea358256a555e34339423
-R 3dd8dcdfd7f56eca682f5b0b9f200abc
+P e605c468e3a1163167831c4a6220825c0b5d083b
+R 0c3dd4aecffc3c33e948e0ad3535455c
 U drh
-Z 6cf52a3b39b332b4094772bd0e2b3942
+Z fde826e1fa4a5f4defa852132d2e9311

diff --git a/manifest.uuid b/manifest.uuid
index 7dcbb18dc087e0d1cfce5c64e47b14c4cddf7957..b2ed6c1c7808b158546b6269136dc2b089389459 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e605c468e3a1163167831c4a6220825c0b5d083b
\ No newline at end of file
+ff2fa407558360f2499b6df0392ab3cdb4788dec
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index 7577acbfb37d91283e17845daba830918de62e31..fa06259d67b0156f55bcce646006f17f2b4faa30 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -319,6 +319,7 @@ struct WhereLoopBuilder {
 #define WHERE_COLUMN_RANGE 0x00000002  /* x<EXPR and/or x>EXPR */
 #define WHERE_COLUMN_IN    0x00000004  /* x IN (...) */
 #define WHERE_COLUMN_NULL  0x00000008  /* x IS NULL */
+#define WHERE_CONSTRAINT   0x0000000f  /* Any of the WHERE_COLUMN_xxx values */
 #define WHERE_TOP_LIMIT    0x00000010  /* x<EXPR or x<=EXPR constraint */
 #define WHERE_BTM_LIMIT    0x00000020  /* x>EXPR or x>=EXPR constraint */
 #define WHERE_BOTH_LIMIT   0x00000030  /* Both x>EXPR and x<EXPR */
@@ -2905,7 +2906,7 @@ static void explainOneScan(
           zWhere
       );
       sqlite3DbFree(db, zWhere);
-    }else if( (flags & WHERE_IPK)!=0 && (flags & WHERE_INDEXED)!=0 ){
+    }else if( (flags & WHERE_IPK)!=0 && (flags & WHERE_CONSTRAINT)!=0 ){
       zMsg = sqlite3MAppendf(db, zMsg, "%s USING INTEGER PRIMARY KEY", zMsg);
 
       if( flags&WHERE_COLUMN_EQ ){