Minor modification to the fix on this branch to avoid adding extra conditional

compilation macros.

FossilOrigin-Name: 4d8be404dab265b51e5a6a95e83be85c22512e19a437191690c7d845c87ff259
This commit is contained in:
dan
2018-09-17 13:38:45 +00:00
parent 0208337c16
commit de79e094bc
4 changed files with 9 additions and 15 deletions
+1 -1
View File
@@ -1076,7 +1076,7 @@ static int renameResolveTrigger(Parse *pParse, const char *zDb){
Table *pTarget = sqlite3LocateTable(pParse, 0, pStep->zTarget, zDb);
if( pTarget==0 ){
rc = SQLITE_ERROR;
}else{
}else if( SQLITE_OK==(rc = sqlite3ViewGetColumnNames(pParse, pTarget)) ){
SrcList sSrc;
memset(&sSrc, 0, sizeof(sSrc));
sSrc.nSrc = 1;
-6
View File
@@ -240,12 +240,6 @@ static int lookupName(
for(i=0, pItem=pSrcList->a; i<pSrcList->nSrc; i++, pItem++){
pTab = pItem->pTab;
assert( pTab!=0 && pTab->zName!=0 );
if( pTab->nCol==0 ){
assert( pParse->eParseMode==PARSE_MODE_RENAME_COLUMN
|| pParse->eParseMode==PARSE_MODE_RENAME_TABLE );
assert( pNC->pParse==pParse );
if( sqlite3ViewGetColumnNames(pParse, pTab) ) return WRC_Abort;
}
if( pItem->pSelect && (pItem->pSelect->selFlags & SF_NestedFrom)!=0 ){
int hit = 0;
pEList = pItem->pSelect->pEList;