From 010bd47b9879aa563d04827497c3a0cd91c19f7d Mon Sep 17 00:00:00 2001 From: drh <> Date: Wed, 17 May 2023 00:26:50 +0000 Subject: Fix two assert() statements that failed to take into account the likely() built-in function. This does not impact production code. FossilOrigin-Name: 8504fe812c5b4956c8acad515d537add54cb591bc81747113f9b24526d7685b8 --- src/expr.c | 2 +- src/treeview.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/expr.c b/src/expr.c index a81b4595b..c6bc847ab 100644 --- a/src/expr.c +++ b/src/expr.c @@ -2191,7 +2191,7 @@ int sqlite3ExprIdToTrueFalse(Expr *pExpr){ ** and 0 if it is FALSE. */ int sqlite3ExprTruthValue(const Expr *pExpr){ - pExpr = sqlite3ExprSkipCollate((Expr*)pExpr); + pExpr = sqlite3ExprSkipCollateAndLikely((Expr*)pExpr); assert( pExpr->op==TK_TRUEFALSE ); assert( !ExprHasProperty(pExpr, EP_IntValue) ); assert( sqlite3StrICmp(pExpr->u.zToken,"true")==0 diff --git a/src/treeview.c b/src/treeview.c index 9f630b156..d55adab38 100644 --- a/src/treeview.c +++ b/src/treeview.c @@ -643,7 +643,8 @@ void sqlite3TreeViewExpr(TreeView *pView, const Expr *pExpr, u8 moreToFollow){ }; assert( pExpr->op2==TK_IS || pExpr->op2==TK_ISNOT ); assert( pExpr->pRight ); - assert( sqlite3ExprSkipCollate(pExpr->pRight)->op==TK_TRUEFALSE ); + assert( sqlite3ExprSkipCollateAndLikely(pExpr->pRight)->op + == TK_TRUEFALSE ); x = (pExpr->op2==TK_ISNOT)*2 + sqlite3ExprTruthValue(pExpr->pRight); zUniOp = azOp[x]; break; -- cgit v1.2.3