Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
| Comment: | Fix an indentation error and improve the placement of an assert() based on a tweet from Yuri Kotov. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
e6314e386c6877c669bd32788d388625 |
| User & Date: | drh 2019-11-22 11:47:04 |
|
2019-11-22
| ||
| 11:49 | Fix a harmless compiler warning. (check-in: 34343c4b user: drh tags: trunk) | |
| 11:47 | Fix an indentation error and improve the placement of an assert() based on a tweet from Yuri Kotov. (check-in: e6314e38 user: drh tags: trunk) | |
| 11:38 | Add more test cases from Yongheng Chen and Rui Zhong. (check-in: f24e6ca4 user: drh tags: trunk) | |
Changes to src/walker.c.
69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 |
int rc;
testcase( ExprHasProperty(pExpr, EP_TokenOnly) );
testcase( ExprHasProperty(pExpr, EP_Reduced) );
while(1){
rc = pWalker->xExprCallback(pWalker, pExpr);
if( rc ) return rc & WRC_Abort;
if( !ExprHasProperty(pExpr,(EP_TokenOnly|EP_Leaf)) ){
if( pExpr->pLeft && walkExpr(pWalker, pExpr->pLeft) ) return WRC_Abort;
assert( pExpr->x.pList==0 || pExpr->pRight==0 );
if( pExpr->pRight ){
assert( !ExprHasProperty(pExpr, EP_WinFunc) );
pExpr = pExpr->pRight;
continue;
}else if( ExprHasProperty(pExpr, EP_xIsSelect) ){
assert( !ExprHasProperty(pExpr, EP_WinFunc) );
if( sqlite3WalkSelect(pWalker, pExpr->x.pSelect) ) return WRC_Abort;
|
< | > |
69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 |
int rc;
testcase( ExprHasProperty(pExpr, EP_TokenOnly) );
testcase( ExprHasProperty(pExpr, EP_Reduced) );
while(1){
rc = pWalker->xExprCallback(pWalker, pExpr);
if( rc ) return rc & WRC_Abort;
if( !ExprHasProperty(pExpr,(EP_TokenOnly|EP_Leaf)) ){
assert( pExpr->x.pList==0 || pExpr->pRight==0 );
if( pExpr->pLeft && walkExpr(pWalker, pExpr->pLeft) ) return WRC_Abort;
if( pExpr->pRight ){
assert( !ExprHasProperty(pExpr, EP_WinFunc) );
pExpr = pExpr->pRight;
continue;
}else if( ExprHasProperty(pExpr, EP_xIsSelect) ){
assert( !ExprHasProperty(pExpr, EP_WinFunc) );
if( sqlite3WalkSelect(pWalker, pExpr->x.pSelect) ) return WRC_Abort;
|