diff options
| author | drh <> | 2021-10-01 02:16:52 +0000 |
|---|---|---|
| committer | drh <> | 2021-10-01 02:16:52 +0000 |
| commit | 817424fe377dd4980f23a37125da8f39abdaba1c (patch) | |
| tree | 7d52741b38a254d143147778a12e4fc6863e4fa1 /src/alter.c | |
| parent | f06db3e8929e36f7686ccc8f9f138359c6b12e80 (diff) | |
| parent | afaa660aef3d596fabbbcf6e99746294f77dbafa (diff) | |
| download | sqlite-817424fe377dd4980f23a37125da8f39abdaba1c.tar.gz sqlite-817424fe377dd4980f23a37125da8f39abdaba1c.zip | |
Merge updates from trunk
FossilOrigin-Name: 35351371c5e9602dec210ad0926ff8a1a269556ce1a166e81eb0543938e0c57e
Diffstat (limited to 'src/alter.c')
| -rw-r--r-- | src/alter.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/alter.c b/src/alter.c index 9cdc342ee..81f6cf69d 100644 --- a/src/alter.c +++ b/src/alter.c @@ -864,9 +864,7 @@ static int renameUnmapSelectCb(Walker *pWalker, Select *p){ Parse *pParse = pWalker->pParse; int i; if( pParse->nErr ) return WRC_Abort; - if( p->selFlags & (SF_View|SF_CopyCte) ){ - testcase( p->selFlags & SF_View ); - testcase( p->selFlags & SF_CopyCte ); + if( NEVER(p->selFlags & (SF_View|SF_CopyCte)) ){ return WRC_Prune; } if( ALWAYS(p->pEList) ){ @@ -881,7 +879,7 @@ static int renameUnmapSelectCb(Walker *pWalker, Select *p){ SrcList *pSrc = p->pSrc; for(i=0; i<pSrc->nSrc; i++){ sqlite3RenameTokenRemap(pParse, 0, (void*)pSrc->a[i].zName); - if( sqlite3WalkExpr(pWalker, pSrc->a[i].pOn) ) return WRC_Abort; + sqlite3WalkExpr(pWalker, pSrc->a[i].pOn); unmapColumnIdlistNames(pParse, pSrc->a[i].pUsing); } } |