diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/expr.c | 7 | ||||
| -rw-r--r-- | src/wherecode.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/expr.c b/src/expr.c index 45c053a8c..a3ed249ee 100644 --- a/src/expr.c +++ b/src/expr.c @@ -3605,7 +3605,12 @@ expr_code_doover: ** constant. */ int iReg = sqlite3ExprCodeTarget(pParse, pExpr->pLeft,target); - int aff = sqlite3TableColumnAffinity(pExpr->y.pTab, pExpr->iColumn); + int aff; + if( pExpr->y.pTab ){ + aff = sqlite3TableColumnAffinity(pExpr->y.pTab, pExpr->iColumn); + }else{ + aff = pExpr->affExpr; + } if( aff>SQLITE_AFF_BLOB ){ static const char zAff[] = "B\000C\000D\000E"; assert( SQLITE_AFF_BLOB=='A' ); diff --git a/src/wherecode.c b/src/wherecode.c index d34912eb7..893ba7b8e 100644 --- a/src/wherecode.c +++ b/src/wherecode.c @@ -1141,6 +1141,8 @@ static int whereIndexExprTransColumn(Walker *p, Expr *pExpr){ if( pExpr->op==TK_COLUMN ){ IdxExprTrans *pX = p->u.pIdxTrans; if( pExpr->iTable==pX->iTabCur && pExpr->iColumn==pX->iTabCol ){ + assert( pExpr->y.pTab!=0 ); + pExpr->affExpr = sqlite3TableColumnAffinity(pExpr->y.pTab,pExpr->iColumn); pExpr->iTable = pX->iIdxCur; pExpr->iColumn = pX->iIdxCol; pExpr->y.pTab = 0; |