diff options
| author | dan <dan@noemail.net> | 2019-06-12 13:49:32 +0000 |
|---|---|---|
| committer | dan <dan@noemail.net> | 2019-06-12 13:49:32 +0000 |
| commit | 6ece353f2d2223ec78e63ce972081a047e89a641 (patch) | |
| tree | 0aea1998f1622dfb47218cacd5c081974d82f2d0 /src | |
| parent | a7d6db6ac05cb7d51c19494feba51a65c6a21cd2 (diff) | |
| download | sqlite-6ece353f2d2223ec78e63ce972081a047e89a641.tar.gz sqlite-6ece353f2d2223ec78e63ce972081a047e89a641.zip | |
Handle expressions like "expr IS TRUE COLLATE xyz" in the same way as "expr IS TRUE". Fix for [4d01eda8115b10d1].
FossilOrigin-Name: 5c6146b56a75a94f4baa10e95407c54dd0b9314a57a8702a4b96b15c4d7ac48c
Diffstat (limited to 'src')
| -rw-r--r-- | src/expr.c | 1 | ||||
| -rw-r--r-- | src/resolve.c | 4 | ||||
| -rw-r--r-- | src/treeview.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/expr.c b/src/expr.c index 763c7b8ad..e6dc20222 100644 --- a/src/expr.c +++ b/src/expr.c @@ -1813,6 +1813,7 @@ int sqlite3ExprIdToTrueFalse(Expr *pExpr){ ** and 0 if it is FALSE. */ int sqlite3ExprTruthValue(const Expr *pExpr){ + pExpr = sqlite3ExprSkipCollate((Expr*)pExpr); assert( pExpr->op==TK_TRUEFALSE ); assert( sqlite3StrICmp(pExpr->u.zToken,"true")==0 || sqlite3StrICmp(pExpr->u.zToken,"false")==0 ); diff --git a/src/resolve.c b/src/resolve.c index b40a5a39c..658792354 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -930,11 +930,11 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){ } case TK_IS: case TK_ISNOT: { - Expr *pRight; + Expr *pRight = sqlite3ExprSkipCollate(pExpr->pRight); assert( !ExprHasProperty(pExpr, EP_Reduced) ); /* Handle special cases of "x IS TRUE", "x IS FALSE", "x IS NOT TRUE", ** and "x IS NOT FALSE". */ - if( (pRight = pExpr->pRight)->op==TK_ID ){ + if( pRight->op==TK_ID ){ int rc = resolveExprStep(pWalker, pRight); if( rc==WRC_Abort ) return WRC_Abort; if( pRight->op==TK_TRUEFALSE ){ diff --git a/src/treeview.c b/src/treeview.c index 981ae2f69..6b4a98e3a 100644 --- a/src/treeview.c +++ b/src/treeview.c @@ -514,7 +514,7 @@ void sqlite3TreeViewExpr(TreeView *pView, const Expr *pExpr, u8 moreToFollow){ }; assert( pExpr->op2==TK_IS || pExpr->op2==TK_ISNOT ); assert( pExpr->pRight ); - assert( pExpr->pRight->op==TK_TRUEFALSE ); + assert( sqlite3ExprSkipCollate(pExpr->pRight)->op==TK_TRUEFALSE ); x = (pExpr->op2==TK_ISNOT)*2 + sqlite3ExprTruthValue(pExpr->pRight); zUniOp = azOp[x]; break; |