diff options
| author | drh <drh@noemail.net> | 2020-01-03 15:22:54 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2020-01-03 15:22:54 +0000 |
| commit | 9ee00200efb5377910cf47bb994c1d47ea125170 (patch) | |
| tree | 7f537c9e3f8bfe9a144e8b3dcf5e3073dcc21dea /src/resolve.c | |
| parent | 618ee336144091caace2d0a647f96883ba7580b9 (diff) | |
| parent | 4c983b2f86d6440cb0687008fd200b681f692749 (diff) | |
| download | sqlite-9ee00200efb5377910cf47bb994c1d47ea125170.tar.gz sqlite-9ee00200efb5377910cf47bb994c1d47ea125170.zip | |
Merge fixes from trunk.
FossilOrigin-Name: 002406df22995880d002be2e4cebb4d560283d4e0d7a4b5a34edcb110802b543
Diffstat (limited to 'src/resolve.c')
| -rw-r--r-- | src/resolve.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/resolve.c b/src/resolve.c index b2df2bac2..4587540d3 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -453,8 +453,7 @@ static int lookupName( for(j=0; j<pEList->nExpr; j++){ char *zAs = pEList->a[j].zEName; if( pEList->a[j].eEName==ENAME_NAME - && ALWAYS(zAs!=0) - && sqlite3StrICmp(zAs, zCol)==0 + && sqlite3_stricmp(zAs, zCol)==0 ){ Expr *pOrig; assert( pExpr->pLeft==0 && pExpr->pRight==0 ); @@ -1133,10 +1132,8 @@ static int resolveAsName( if( pE->op==TK_ID ){ char *zCol = pE->u.zToken; for(i=0; i<pEList->nExpr; i++){ - char *zAs = pEList->a[i].zEName; if( pEList->a[i].eEName==ENAME_NAME - && ALWAYS(zAs!=0) - && sqlite3StrICmp(zAs, zCol)==0 + && sqlite3_stricmp(pEList->a[i].zEName, zCol)==0 ){ return i+1; } |