diff options
| author | drh <drh@noemail.net> | 2020-10-02 12:42:51 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2020-10-02 12:42:51 +0000 |
| commit | 9bb612f2c8d0e1e9672aa019b0f05059b6c24c3a (patch) | |
| tree | 8305fb2511bf81a67e35ae1891aa15d81b2ac350 /src | |
| parent | 04e70ce07d8a9501c695eaafd2cb4dfc4537761f (diff) | |
| download | sqlite-9bb612f2c8d0e1e9672aa019b0f05059b6c24c3a.tar.gz sqlite-9bb612f2c8d0e1e9672aa019b0f05059b6c24c3a.zip | |
Fix a faulty assert() statement. Add new test cases.
FossilOrigin-Name: 80ecdb3da4558bb08ee3ec6edbde906ad5b3b8182e672b5ba0d5dfa8041cee0a
Diffstat (limited to 'src')
| -rw-r--r-- | src/expr.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/expr.c b/src/expr.c index 7277bb75d..2c4d23331 100644 --- a/src/expr.c +++ b/src/expr.c @@ -45,7 +45,9 @@ char sqlite3TableColumnAffinity(Table *pTab, int iCol){ char sqlite3ExprAffinity(const Expr *pExpr){ int op; while( ExprHasProperty(pExpr, EP_Skip|EP_IfNullRow) ){ - assert( pExpr->op==TK_COLLATE || pExpr->op==TK_IF_NULL_ROW ); + assert( pExpr->op==TK_COLLATE + || pExpr->op==TK_IF_NULL_ROW + || (pExpr->op==TK_REGISTER && pExpr->op2==TK_IF_NULL_ROW) ); pExpr = pExpr->pLeft; assert( pExpr!=0 ); } |