More improvements to TreeView output for Window objects:

(1) Show when the frame-spec is implied rather than explicit.
(2) Move the FILTER clause out from within the OVER clause, making it
a sibling of the OVER clause, to match syntax.

FossilOrigin-Name: d6a07433421ac9a475ff0014587f0beefdf88ce89aef9443f8a20cd26083731f

diff --git a/manifest b/manifest
index 2fc7b60fb8b71e9c83659fb49b2bfefe855b430f..b9660770369da37ca75af8b7f70de24f9066f4e0 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improved\sTreeView\sdisplay\sof\sWindow\sobjects.\nChange\sthe\sWindow.eType\sfield\sto\sWindow.eFrmType\sto\savoid\sconfusion\swith\nother\s"eType"\svalues.
-D 2019-03-28T13:03:41.454
+C More\simprovements\sto\sTreeView\soutput\sfor\sWindow\sobjects:\n(1)\sShow\swhen\sthe\sframe-spec\sis\simplied\srather\sthan\sexplicit.\n(2)\sMove\sthe\sFILTER\sclause\sout\sfrom\swithin\sthe\sOVER\sclause,\smaking\sit\na\ssibling\sof\sthe\sOVER\sclause,\sto\smatch\ssyntax.
+D 2019-03-28T13:35:28.585
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -580,7 +580,7 @@ F src/test_window.c cdae419fdcea5bad6dcd9368c685abdad6deb59e9fc8b84b153de513d394
 F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
 F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
 F src/tokenize.c d3615f0cbe4db5949503bf5916f3cd4fa5de855d5b4ef560f3b6dd5629423a1e
-F src/treeview.c f41d6a62ff054277e068829859b0f6259fb6a9ebda2e87aa3a83b01f4cb3cc0b
+F src/treeview.c 3885029c8297eb391f7196d6ee23bbee23dc2b7543eb50509b38e0a5efc55b9d
 F src/trigger.c bb034c08eca111e66a19cda045903a12547c1be2294b5570d794b869d9c44a73
 F src/update.c 0b973357d88092140531e07ff641139c26fb4380b0b9f5ed98c5f7691b4604d1
 F src/upsert.c 0dd81b40206841814d46942a7337786932475f085716042d0cb2fc7791bf8ca4
@@ -1813,7 +1813,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 85e53ff13300132250221de769a2aa7d92d81bb48d60f6e99000bc69a5b1e6fb
-R 955959731aaddc58f4bc71017ffeeb76
+P ec2f207dedb223077bbd3e4584499250eb12219712c917e930acccfa2c46e23b
+R bf6c31ccc3d2df556342ad1b283d4361
 U drh
-Z fae16977b4563395e6e67b312131bb19
+Z 72ed78e3b1da4bfd00333fe521bbd678

diff --git a/manifest.uuid b/manifest.uuid
index 70aa3fbe7e34e2c638c0b86452deee087d7269f1..76aae2a7fdb42abedb6d681f25f2eac0e6559f4e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ec2f207dedb223077bbd3e4584499250eb12219712c917e930acccfa2c46e23b
\ No newline at end of file
+d6a07433421ac9a475ff0014587f0beefdf88ce89aef9443f8a20cd26083731f
\ No newline at end of file

diff --git a/src/treeview.c b/src/treeview.c
index 490c2c3cb0d0e680d6c16560a8077a5beed673e1..af5e907f927c5407b5c1ece849a012e091fabce3 100644 (file)
--- a/src/treeview.c
+++ b/src/treeview.c
@@ -310,22 +310,21 @@ void sqlite3TreeViewBound(
 */
 void sqlite3TreeViewWindow(TreeView *pView, const Window *pWin, u8 more){
   int nElement = 0;
+  if( pWin->pFilter ){
+    sqlite3TreeViewItem(pView, "FILTER", 1);
+    sqlite3TreeViewExpr(pView, pWin->pFilter, 0);
+    sqlite3TreeViewPop(pView);
+  }
   pView = sqlite3TreeViewPush(pView, more);
   if( pWin->zName ){
     sqlite3TreeViewLine(pView, "OVER %s", pWin->zName);
   }else{
     sqlite3TreeViewLine(pView, "OVER");
   }
-  if( pWin->pFilter )  nElement++;
   if( pWin->zBase )    nElement++;
   if( pWin->pOrderBy ) nElement++;
   if( pWin->eFrmType ) nElement++;
   if( pWin->eExclude ) nElement++;
-  if( pWin->pFilter ){
-    sqlite3TreeViewItem(pView, "FILTER", (--nElement)>0);
-    sqlite3TreeViewExpr(pView, pWin->pFilter, 0);
-    sqlite3TreeViewPop(pView);
-  }
   if( pWin->zBase ){
     sqlite3TreeViewPush(pView, (--nElement)>0);
     sqlite3TreeViewLine(pView, "window: %s", pWin->zBase);
@@ -338,10 +337,13 @@ void sqlite3TreeViewWindow(TreeView *pView, const Window *pWin, u8 more){
     sqlite3TreeViewExprList(pView, pWin->pOrderBy, (--nElement)>0, "ORDER-BY");
   }
   if( pWin->eFrmType ){
+    char zBuf[30];
     const char *zFrmType = "ROWS";
     if( pWin->eFrmType==TK_RANGE ) zFrmType = "RANGE";
     if( pWin->eFrmType==TK_GROUPS ) zFrmType = "GROUPS";
-    sqlite3TreeViewItem(pView, zFrmType, (--nElement)>0);
+    sqlite3_snprintf(sizeof(zBuf),zBuf,"%s%s",zFrmType,
+        pWin->bImplicitFrame ? " (implied)" : "");
+    sqlite3TreeViewItem(pView, zBuf, (--nElement)>0);
     sqlite3TreeViewBound(pView, pWin->eStart, pWin->pStart, 1);
     sqlite3TreeViewBound(pView, pWin->eEnd, pWin->pEnd, 0);
     sqlite3TreeViewPop(pView);