Formatting improvements to the WHERE-clause constraint display in the

wheretrace debugging logic.

FossilOrigin-Name: 3a9e3ed94bf617f00c48009b1a6d348a8f23a3cf

diff --git a/manifest b/manifest
index c0dd491e834323ea069a692e12017c224ec24f38..f66ec4132d3b8623cc117161270dd1bbe0178b6d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sregression\stests\sfor\sticket\s[c620261b5b5].
-D 2013-10-28T20:38:52.030
+C Formatting\simprovements\sto\sthe\sWHERE-clause\sconstraint\sdisplay\sin\sthe\nwheretrace\sdebugging\slogic.
+D 2013-10-28T22:33:36.558
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 0522b53cdc1fcfc18f3a98e0246add129136c654
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -292,7 +292,7 @@ F src/vtab.c 5a423b042eb1402ef77697d03d6a67378d97bc8d
 F src/wal.c 7dc3966ef98b74422267e7e6e46e07ff6c6eb1b4
 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 F src/walker.c e9e593d5bb798c3e67fc3893dfe7055c9e7d8d74
-F src/where.c 626e04bea7b0c62d8053f816e84da4ffe265599f
+F src/where.c f18400f121fd27385f41cdff7aa8a811feca842e
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6
@@ -1126,7 +1126,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P 9aac4e588cbce55c1098321bcd042d5b04036893
-R 755b6f8582cdf6a61e2dc488ee0ff755
+P 05a35b09b140fed0898afd36bc641e275545a35f
+R ff7bb3f8071649882bf49e664fcf0a45
 U drh
-Z d41611593bf5e267c6a2f2cb626395da
+Z 9d63edd4f24f764673ec22cc76454487

diff --git a/manifest.uuid b/manifest.uuid
index 8c3bceda2312fbedfe7baeca1cd5a8540d7a06a9..9f87ae481e804e56f04175f403abf00bae8b8cb2 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-05a35b09b140fed0898afd36bc641e275545a35f
\ No newline at end of file
+3a9e3ed94bf617f00c48009b1a6d348a8f23a3cf
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index 4868a7a0b0952ec98ea9d125af04e37e82cd8eaa..304732db67e99806f2b7f9ecf167bdd9a07c5d48 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -3903,9 +3903,6 @@ static void whereExplainTerm(Vdbe *v, WhereTerm *pTerm){
   if( pTerm->eOperator & WO_EQUIV  ) zType[1] = 'E';
   if( ExprHasProperty(pTerm->pExpr, EP_FromJoin) ) zType[2] = 'L';
   sqlite3ExplainPrintf(v, "%s ", zType);
-  if( (pTerm->wtFlags & (TERM_ORINFO|TERM_ANDINFO))==0 ){
-    sqlite3ExplainPrintf(v, "lhs=%-2d ", pTerm->u.leftColumn);
-  }
   sqlite3ExplainExpr(v, pTerm->pExpr);
 }
 #endif /* WHERETRACE_ENABLED && SQLITE_ENABLE_TREE_EXPLAIN */
@@ -3959,7 +3956,7 @@ static void whereLoopPrint(WhereLoop *p, WhereClause *pWC){
     sqlite3ExplainBegin(v);
     for(i=0; i<p->nLTerm; i++){
       WhereTerm *pTerm = p->aLTerm[i];
-      sqlite3ExplainPrintf(v, "  (%d) #%d ", i+1, (int)(pTerm-pWC->a));
+      sqlite3ExplainPrintf(v, "  (%d) #%-2d ", i+1, (int)(pTerm-pWC->a));
       sqlite3ExplainPush(v);
       whereExplainTerm(v, pTerm);
       sqlite3ExplainPop(v);
@@ -5865,7 +5862,7 @@ WhereInfo *sqlite3WhereBegin(
     Vdbe *v = pParse->pVdbe;
     sqlite3ExplainBegin(v);
     for(i=0; i<sWLB.pWC->nTerm; i++){
-      sqlite3ExplainPrintf(v, "#%d ", i);
+      sqlite3ExplainPrintf(v, "#%-2d ", i);
       sqlite3ExplainPush(v);
       whereExplainTerm(v, &sWLB.pWC->a[i]);
       sqlite3ExplainPop(v);