With TreeView, only show the table columns for a SrcItem if the data source

is a subquery rather than a persistent table.

FossilOrigin-Name: 7b4a0d0fa1d8facaf5e550650d9b261eda7eb7a2a413627f2751f01c5477e1f3

diff --git a/manifest b/manifest
index 1db87ff47d466336c5fd34fc2a9f05ea5c745e6b..b2507fac8d3042a7b71a1edd70a1d0868b01714a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Multiple\senhancements\sto\sthe\sTreeView\soutput\sfor\sSrcItem,\scherrypicked\sfrom\nthe\sright-join\sexperimental\sbranch.
-D 2022-04-29T17:13:52.271
+C With\sTreeView,\sonly\sshow\sthe\stable\scolumns\sfor\sa\sSrcItem\sif\sthe\sdata\ssource\nis\sa\ssubquery\srather\sthan\sa\spersistent\stable.
+D 2022-04-29T17:45:39.378
 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 330f396050a87e79025c35237b75f0feb8e11327c8b3f4ab7a858cf86336e270
+F src/treeview.c 9b4fcabab81fa0e6c93b70911b2e06012df03e230fef8b170bf77ab99e544dd8
 F src/trigger.c 372ada38f667c6823a3db15749eb668338e65c793394e55a37e56a489f2d1b55
 F src/update.c 2cfaded82ca80ff56afb8c3ae5e88284e0824bfd86119827cc22481959f96f92
 F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937
@@ -1951,10 +1951,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 680ccecbc839373194ed2dcc1053e25512d9ea3f12f8c8963cb8fbd1a034d2f8
-Q +3aafccb5c3c780c29090ee5eb428a6c3153627ce8bf834bbd392e79a30e9389b
-Q +9cba3ce577e442f83d7a2d6926e38ffe6bc45953c88ecdd384f3455890303cce
-R f351c482825f9cb2175ee0f0b69f0e4a
+P 293afa81112e824eec2557d004a27319d484276f796936e16d64243fe24f6b68
+R 28b9d27cf579722d7bb4ce1924ff221c
 U drh
-Z f1d3e45872b682fe27f7e5ce12e577b8
+Z 77bba4f7ca9ae44652d512641bde86ff
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 0fbdaafb8089e5019ed2340d087f0f8a82b89eae..16481a0f72c6583bddc3f5f0ac57718f00fe1741 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-293afa81112e824eec2557d004a27319d484276f796936e16d64243fe24f6b68
\ No newline at end of file
+7b4a0d0fa1d8facaf5e550650d9b261eda7eb7a2a413627f2751f01c5477e1f3
\ No newline at end of file

diff --git a/src/treeview.c b/src/treeview.c
index 3aee7df6757b85bd7f8e5c04b1e1699c5ddbb44d..0ad3bd0eb8f9dfba4912bc20f3fa27f6b29d9635 100644 (file)
--- a/src/treeview.c
+++ b/src/treeview.c
@@ -218,18 +218,17 @@ 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, (--n)>0);
-    }
     if( pItem->pSelect ){
+      if( pItem->pTab ){
+        Table *pTab = pItem->pTab;
+        sqlite3TreeViewColumnList(pView, pTab->aCol, pTab->nCol, 1);
+      }
       assert( pItem->fg.isNestedFrom == IsNestedFrom(pItem->pSelect) );
       sqlite3TreeViewSelect(pView, pItem->pSelect, (--n)>0);
     }