diff options
author | stephan <stephan@noemail.net> | 2022-07-20 10:09:19 +0000 |
---|---|---|
committer | stephan <stephan@noemail.net> | 2022-07-20 10:09:19 +0000 |
commit | 4b5919e2ced99d8df9d0795ca741408cfee6c993 (patch) | |
tree | e624334835b255a5a13ac89ddc576b9347b1e760 /src/treeview.c | |
parent | bc7180cdb362b0069fed60b0c207533122cc5ec2 (diff) | |
parent | a5cc692422afa7fad710a4459139d7ba00346b21 (diff) | |
download | sqlite-4b5919e2ced99d8df9d0795ca741408cfee6c993.tar.gz sqlite-4b5919e2ced99d8df9d0795ca741408cfee6c993.zip |
Merged in trunk.
FossilOrigin-Name: d662796c658997be13fdc3b77ad97101b9513da53fd0b824d7a4050cac3f7eba
Diffstat (limited to 'src/treeview.c')
-rw-r--r-- | src/treeview.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/treeview.c b/src/treeview.c index 366c4afd1..89a128dff 100644 --- a/src/treeview.c +++ b/src/treeview.c @@ -100,8 +100,8 @@ void sqlite3TreeViewColumnList( sqlite3TreeViewLine(pView, "COLUMNS"); for(i=0; i<nCol; i++){ u16 flg = aCol[i].colFlags; - int moreToFollow = i<(nCol - 1); - sqlite3TreeViewPush(&pView, moreToFollow); + int colMoreToFollow = i<(nCol - 1); + sqlite3TreeViewPush(&pView, colMoreToFollow); sqlite3TreeViewLine(pView, 0); printf(" %s", aCol[i].zCnName); switch( aCol[i].eCType ){ @@ -232,7 +232,7 @@ void sqlite3TreeViewSrcList(TreeView *pView, const SrcList *pSrc){ Table *pTab = pItem->pTab; sqlite3TreeViewColumnList(pView, pTab->aCol, pTab->nCol, 1); } - assert( pItem->fg.isNestedFrom == IsNestedFrom(pItem->pSelect) ); + assert( (int)pItem->fg.isNestedFrom == IsNestedFrom(pItem->pSelect) ); sqlite3TreeViewSelect(pView, pItem->pSelect, (--n)>0); } if( pItem->fg.isTabFunc ){ @@ -999,6 +999,7 @@ void sqlite3TreeViewUpsert( sqlite3TreeViewPop(&pView); } +#if TREETRACE_ENABLED /* ** Generate a human-readable diagram of the data structure that go ** into generating an DELETE statement. @@ -1052,7 +1053,9 @@ void sqlite3TreeViewDelete( } sqlite3TreeViewPop(&pView); } +#endif /* TREETRACE_ENABLED */ +#if TREETRACE_ENABLED /* ** Generate a human-readable diagram of the data structure that go ** into generating an INSERT statement. @@ -1120,7 +1123,9 @@ void sqlite3TreeViewInsert( } sqlite3TreeViewPop(&pView); } +#endif /* TREETRACE_ENABLED */ +#if TREETRACE_ENABLED /* ** Generate a human-readable diagram of the data structure that go ** into generating an UPDATE statement. @@ -1196,6 +1201,7 @@ void sqlite3TreeViewUpdate( } sqlite3TreeViewPop(&pView); } +#endif /* TREETRACE_ENABLED */ #ifndef SQLITE_OMIT_TRIGGER /* |