diff options
| author | drh <> | 2024-07-31 23:46:10 +0000 |
|---|---|---|
| committer | drh <> | 2024-07-31 23:46:10 +0000 |
| commit | a3ee3860a2bef9f44561093b5e39d9160840671b (patch) | |
| tree | fab970cd979cde29df6ca4ddc1856fd2d6af870d /src/treeview.c | |
| parent | c96e47c80e67d3a21c591ccb3432f3c18153f8aa (diff) | |
| parent | a1291e79d3d0c8b6aa40b455151b988a92879e17 (diff) | |
| download | sqlite-a3ee3860a2bef9f44561093b5e39d9160840671b.tar.gz sqlite-a3ee3860a2bef9f44561093b5e39d9160840671b.zip | |
Merge all the latest trunk enhancements into the exists-to-join branch.
FossilOrigin-Name: 9084a4c8726a2c7ba1c381886e29c7b86121d531282be0d63d5988d84f6f448d
Diffstat (limited to 'src/treeview.c')
| -rw-r--r-- | src/treeview.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/treeview.c b/src/treeview.c index 054265338..3960d2859 100644 --- a/src/treeview.c +++ b/src/treeview.c @@ -237,14 +237,12 @@ void sqlite3TreeViewSrcList(TreeView *pView, const SrcList *pSrc){ sqlite3TreeViewIdList(pView, pItem->u3.pUsing, (--n)>0, "USING"); } if( pItem->pSelect ){ - sqlite3TreeViewPush(&pView, i+1<pSrc->nSrc); if( pItem->pTab ){ Table *pTab = pItem->pTab; sqlite3TreeViewColumnList(pView, pTab->aCol, pTab->nCol, 1); } assert( (int)pItem->fg.isNestedFrom == IsNestedFrom(pItem->pSelect) ); sqlite3TreeViewSelect(pView, pItem->pSelect, (--n)>0); - sqlite3TreeViewPop(&pView); } if( pItem->fg.isTabFunc ){ sqlite3TreeViewExprList(pView, pItem->u1.pFuncArg, 0, "func-args:"); @@ -286,7 +284,7 @@ void sqlite3TreeViewSelect(TreeView *pView, const Select *p, u8 moreToFollow){ n = 1000; }else{ n = 0; - if( p->pSrc && p->pSrc->nSrc ) n++; + if( p->pSrc && p->pSrc->nSrc && p->pSrc->nAlloc ) n++; if( p->pWhere ) n++; if( p->pGroupBy ) n++; if( p->pHaving ) n++; @@ -312,7 +310,7 @@ void sqlite3TreeViewSelect(TreeView *pView, const Select *p, u8 moreToFollow){ sqlite3TreeViewPop(&pView); } #endif - if( p->pSrc && p->pSrc->nSrc ){ + if( p->pSrc && p->pSrc->nSrc && p->pSrc->nAlloc ){ sqlite3TreeViewPush(&pView, (n--)>0); sqlite3TreeViewLine(pView, "FROM"); sqlite3TreeViewSrcList(pView, p->pSrc); |