The ".selecttrace 4" command now shows only a single parse tree after

name resolution.

FossilOrigin-Name: 5682146e8a4ebb4edc1e1b53fbf3daf77f8cb9cd9bc2aa32acb34fa5824bd518

diff --git a/manifest b/manifest
index a56b7c293ef34c47af92936436de26af79754e35..79e7f71a5b26e126daea68095bf8658c5cf75953 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\srestore\sthe\siSelectId\svalue\suntil\safter\sthe\slast\sSELECTTRACE\swhen\ndebugging\sSelect\sprocessing.
-D 2018-04-23T17:09:58.431
+C The\s".selecttrace\s4"\scommand\snow\sshows\sonly\sa\ssingle\sparse\stree\safter\nname\sresolution.
+D 2018-04-23T17:18:03.071
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 5ce9343cba9c189046f1afe6d2bcc1f68079439febc05267b98aec6ecc752439
@@ -492,7 +492,7 @@ F src/printf.c d3b7844ddeb11fbbdd38dd84d09c9c1ac171d21fb038473c3aa97981201cc660
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 6415381a0e9d22c0e7cba33ca4a53f81474190862f5d4838190f5eb5b0b47bc9
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
-F src/select.c 96ed6724a8c360c441445de32e99e1763b136219c83f5028d3f555f502dfe5a7
+F src/select.c e08e65b862e566931a30a75469160f4b3dd4353919b71480af70e55ed0612836
 F src/shell.c.in 8ab4687da814ddc4adf6ea0fcd43ea1eb2784ee6915674dd690759241b7a24b3
 F src/sqlite.h.in aa9bd3ae4a077c7002059cb418271abe52214b0227b2a734bc44736b24cbcc40
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -1725,7 +1725,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 5c6339f955eaa550c7d112488d7830e67ceacba4fbba12e1c5ce2970980159e0
-R dcbce3b7b5d783ef8f18f7278fefb70e
+P 8088d8cac317adb96e357a8f4a196d7c1e0115af9c2335f167b4d7e7154299b0
+R 534f674dc3bc4c5687529a177afe37ee
 U drh
-Z d0f4a98c3a2364de015322e4d5ad2b11
+Z 874f3440d56fae0ddd14983dae319f3e

diff --git a/manifest.uuid b/manifest.uuid
index cbf2fd3513204d6dd3c7ba2ff7f84f9471932314..a522ed1a2e7521a0a410184687cc1afec6ef1132 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8088d8cac317adb96e357a8f4a196d7c1e0115af9c2335f167b4d7e7154299b0
\ No newline at end of file
+5682146e8a4ebb4edc1e1b53fbf3daf77f8cb9cd9bc2aa32acb34fa5824bd518
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index 3a7a4eb85a5642d21a939d4de0ef34ca5a777607..3a40308dcbdb92311d8632726aa7470ffbf5a65b 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -3819,9 +3819,8 @@ static int flattenSubquery(
       if( pPrior ) pPrior->pNext = pNew;
       pNew->pNext = p;
       p->pPrior = pNew;
-      SELECTTRACE(2,pParse,p,
-         ("compound-subquery flattener creates %s.%p as peer\n",
-         pNew->zSelName, pNew));
+      SELECTTRACE(2,pParse,p,("compound-subquery flattener"
+                              " creates %s.%p as peer\n",pNew->zSelName, pNew));
     }
     if( db->mallocFailed ) return 1;
   }
@@ -5384,8 +5383,8 @@ int sqlite3Select(
   assert( p->pEList!=0 );
   isAgg = (p->selFlags & SF_Aggregate)!=0;
 #if SELECTTRACE_ENABLED
-  if( sqlite3SelectTrace & 0x100 ){
-    SELECTTRACE(0x100,pParse,p, ("after name resolution:\n"));
+  if( sqlite3SelectTrace & 0x104 ){
+    SELECTTRACE(0x104,pParse,p, ("after name resolution:\n"));
     sqlite3TreeViewSelect(0, p, 0);
   }
 #endif