Show the USING clause as part of the tree-view display of SrcItem.

FossilOrigin-Name: 9cba3ce577e442f83d7a2d6926e38ffe6bc45953c88ecdd384f3455890303cce

diff --git a/manifest b/manifest
index e7f03310c2b6899e202b63b82640d24324657c50..ee8227b22f4f35e146a4ce92e39b8ec6aa7b3106 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\streeview.c,\sshow\sthe\scolumns\sof\sthe\stable\sassociated\swith\seach\sSrcItem.
-D 2022-04-28T18:17:51.855
+C Show\sthe\sUSING\sclause\sas\spart\sof\sthe\stree-view\sdisplay\sof\sSrcItem.
+D 2022-04-29T17:03:25.685
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -618,7 +618,7 @@ F src/test_window.c cdae419fdcea5bad6dcd9368c685abdad6deb59e9fc8b84b153de513d394
 F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
 F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
 F src/tokenize.c a38f52058b517929e264094abd0b5fd1e8e145a1aa43bc6f6a72ae5218f96c98
-F src/treeview.c d9c5192f2c6b0a407a1ba08ca9e034cdedfcb0120a10d7a3fa8714c7df33cc0a
+F src/treeview.c 06fbe7bcd8703ff037c831251ca197c3e39801a2d4c75a278581413ec52b2bdd
 F src/trigger.c 372ada38f667c6823a3db15749eb668338e65c793394e55a37e56a489f2d1b55
 F src/update.c 2cfaded82ca80ff56afb8c3ae5e88284e0824bfd86119827cc22481959f96f92
 F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937
@@ -1952,8 +1952,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P c86804917e3fffcf0c19bbf11875667f7968275210fc768e650826bd9c87a5d2
-R 7f4fb98be4c8c890dd54dec76be25961
+P 3aafccb5c3c780c29090ee5eb428a6c3153627ce8bf834bbd392e79a30e9389b
+R 8943973edba9ba4c2b994eff77854a7b
 U drh
-Z 16a509b7728b4678c071207eaf46d79a
+Z ac8b1738cb42dc17aee412492b492bec
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 8de9a843127a638550d6e302cd2a3c98ae0d6b25..80c0be0c0854d166ab0dd7c9de0fc9fa1be3e450 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3aafccb5c3c780c29090ee5eb428a6c3153627ce8bf834bbd392e79a30e9389b
\ No newline at end of file
+9cba3ce577e442f83d7a2d6926e38ffe6bc45953c88ecdd384f3455890303cce
\ No newline at end of file

diff --git a/src/treeview.c b/src/treeview.c
index 009ba273989e71e09f4217aea958067eb2eb41ce..04ee80f7ac0d57754ed9d6980230f0b09d751f53 100644 (file)
--- a/src/treeview.c
+++ b/src/treeview.c
@@ -186,6 +186,7 @@ void sqlite3TreeViewSrcList(TreeView *pView, const SrcList *pSrc){
   for(i=0; i<pSrc->nSrc; i++){
     const SrcItem *pItem = &pSrc->a[i];
     StrAccum x;
+    int n = 0;
     char zLine[100];
     sqlite3StrAccumInit(&x, 0, zLine, sizeof(zLine), 0);
     x.printfFlags |= SQLITE_PRINTF_INTERNAL;
@@ -214,14 +215,21 @@ void sqlite3TreeViewSrcList(TreeView *pView, const SrcList *pSrc){
     }
     sqlite3StrAccumFinish(&x);
     sqlite3TreeViewItem(pView, zLine, i<pSrc->nSrc-1);
+    n = 0;
+    if( pItem->pTab ) n++;
+    if( pItem->pSelect ) n++;
+    if( pItem->fg.isTabFunc ) n++;
+    if( pItem->fg.isUsing ) n++;
+    if( pItem->fg.isUsing ){
+      sqlite3TreeViewIdList(pView, pItem->u3.pUsing, (--n)>0, "USING");
+    }
     if( pItem->pTab ){
       Table *pTab = pItem->pTab;
-      sqlite3TreeViewColumnList(pView, pTab->aCol, pTab->nCol,
-                                pItem->pSelect!=0);
+      sqlite3TreeViewColumnList(pView, pTab->aCol, pTab->nCol, (--n)>0);
     }
     if( pItem->pSelect ){
       assert( pItem->fg.isNestedFrom == IsNestedFrom(pItem->pSelect) );
-      sqlite3TreeViewSelect(pView, pItem->pSelect, 0);
+      sqlite3TreeViewSelect(pView, pItem->pSelect, (--n)>0);
     }
     if( pItem->fg.isTabFunc ){
       sqlite3TreeViewExprList(pView, pItem->u1.pFuncArg, 0, "func-args:");