diff options
| author | drh <drh@noemail.net> | 2020-04-07 01:18:23 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2020-04-07 01:18:23 +0000 |
| commit | 2d99f9572180c67786357883ecffaceca596e33b (patch) | |
| tree | da623ab105130bcf4578dd5cce72d59eb8c770cd /src | |
| parent | b3120fdf5be0ae665448f0e3d694a53f12a635bc (diff) | |
| download | sqlite-2d99f9572180c67786357883ecffaceca596e33b.tar.gz sqlite-2d99f9572180c67786357883ecffaceca596e33b.zip | |
The ALTER TABLE fix of check-in [7e5ad8e0ab7ee91a] is no longer needed due
to the changes at check-in [4cf8721f5ceb1fda]. But, we keep the defense
in place as an assert() for extra safety.
FossilOrigin-Name: 230556e859536bbadf0daf8133a9a01ef4f03148b3296723e37bad66e3fc3d82
Diffstat (limited to 'src')
| -rw-r--r-- | src/alter.c | 2 | ||||
| -rw-r--r-- | src/expr.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/alter.c b/src/alter.c index b041291a2..c357f2207 100644 --- a/src/alter.c +++ b/src/alter.c @@ -698,7 +698,7 @@ void *sqlite3RenameTokenMap(Parse *pParse, void *pPtr, Token *pToken){ RenameToken *pNew; assert( pPtr || pParse->db->mallocFailed ); renameTokenCheckAll(pParse, pPtr); - if( pParse->eParseMode!=PARSE_MODE_UNMAP ){ + if( ALWAYS(pParse->eParseMode!=PARSE_MODE_UNMAP) ){ pNew = sqlite3DbMallocZero(pParse->db, sizeof(RenameToken)); if( pNew ){ pNew->p = pPtr; diff --git a/src/expr.c b/src/expr.c index 0629f508a..7165e4fa1 100644 --- a/src/expr.c +++ b/src/expr.c @@ -1787,6 +1787,7 @@ void sqlite3ExprListSetName( int dequote /* True to cause the name to be dequoted */ ){ assert( pList!=0 || pParse->db->mallocFailed!=0 ); + assert( pParse->eParseMode!=PARSE_MODE_UNMAP || dequote==0 ); if( pList ){ struct ExprList_item *pItem; assert( pList->nExpr>0 ); |