Additional detail added to the tree-explain output for SELECT statements.

FossilOrigin-Name: 7b457ea4551ba411a4747d74fb78b795cc8d9ee6

diff --git a/manifest b/manifest
index 69c584782067f74d937e3ee756f2f83b96f860a2..3aac83707ea93f0e2dc7cbe0660458ba0d422a5d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C More\scompact\snotation\sfor\sthe\sparse-tree\sview.
-D 2011-12-07T15:33:14.109
+C Additional\sdetail\sadded\sto\sthe\stree-explain\soutput\sfor\sSELECT\sstatements.
+D 2011-12-07T22:49:42.588
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5b4a3e12a850b021547e43daf886b25133b44c07
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -180,7 +180,7 @@ F src/printf.c 7ffb4ebb8b341f67e049695ba031da717b3d2699
 F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
 F src/resolve.c 365ab1c870e38596d6869e76fb544fe6e4ffc809
 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
-F src/select.c 984ff4d2865fbf13a0ddeedbf892a93094f2b9dd
+F src/select.c 912bea602425df403c464c7da9a89a56281623a3
 F src/shell.c a1eadb2fdbfa45e54307263f0c8da8ee8cd61b8b
 F src/sqlite.h.in 1dc07194eb1a2c69c8ef75f88022b170be08024a
 F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
@@ -977,7 +977,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 7e5b56b1c602d4adfd4496a9c877f3b685b2d360
-R 7004d54e96eda502d15d7553ec65e84c
+P 0eb3f8b1e3a196811fb54a5e2645debe6119610a
+R c8f99de136cf931e1dc991f6945ded2c
 U drh
-Z 6c7ae5dd374ffa9280bde6b5186b14b5
+Z 90b0a98552fa9f4d4fff3f8a611f18ca

diff --git a/manifest.uuid b/manifest.uuid
index 870fbb8eb10aab5afebe391ff53112d59015f5a4..3c8a88f6d353fab3e533a491a0835dbaddd3369f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0eb3f8b1e3a196811fb54a5e2645debe6119610a
\ No newline at end of file
+7b457ea4551ba411a4747d74fb78b795cc8d9ee6
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index d51ae103ee5d068ac07fe90ca9e4e2037402de18..f761a0897741b47ac9beed4c782789fd348937f4 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -4500,6 +4500,16 @@ select_end:
 */
 static void explainOneSelect(Vdbe *pVdbe, Select *p){
   sqlite3ExplainPrintf(pVdbe, "SELECT ");
+  if( p->selFlags & (SF_Distinct|SF_Aggregate) ){
+    if( p->selFlags & SF_Distinct ){
+      sqlite3ExplainPrintf(pVdbe, "DISTINCT ");
+    }
+    if( p->selFlags & SF_Aggregate ){
+      sqlite3ExplainPrintf(pVdbe, "agg_flag ");
+    }
+    sqlite3ExplainNL(pVdbe);
+    sqlite3ExplainPrintf(pVdbe, "   ");
+  }
   sqlite3ExplainExprList(pVdbe, p->pEList);
   sqlite3ExplainNL(pVdbe);
   if( p->pSrc && p->pSrc->nSrc ){