diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/parse.y | 3 | ||||
-rw-r--r-- | src/treeview.c | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/parse.y b/src/parse.y index 65977bbba..37560a2e0 100644 --- a/src/parse.y +++ b/src/parse.y @@ -721,6 +721,9 @@ seltablist(A) ::= stl_prefix(A) nm(Y) dbnm(D) LP exprlist(E) RP as(Z) on_using(N pNew->zName = pOld->zName; pNew->zDatabase = pOld->zDatabase; pNew->pSelect = pOld->pSelect; + if( pNew->pSelect && (pNew->pSelect->selFlags & SF_NestedFrom)!=0 ){ + pNew->fg.isNestedFrom = 1; + } if( pOld->fg.isTabFunc ){ pNew->u1.pFuncArg = pOld->u1.pFuncArg; pOld->u1.pFuncArg = 0; diff --git a/src/treeview.c b/src/treeview.c index 95c14448f..3ba8a63cd 100644 --- a/src/treeview.c +++ b/src/treeview.c @@ -166,6 +166,7 @@ void sqlite3TreeViewSrcList(TreeView *pView, const SrcList *pSrc){ sqlite3StrAccumFinish(&x); sqlite3TreeViewItem(pView, zLine, i<pSrc->nSrc-1); if( pItem->pSelect ){ + assert( pItem->fg.isNestedFrom == IsNestedFrom(pItem->pSelect) ); sqlite3TreeViewSelect(pView, pItem->pSelect, 0); } if( pItem->fg.isTabFunc ){ |