diff options
author | dan <Dan Kennedy> | 2021-06-23 11:12:48 +0000 |
---|---|---|
committer | dan <Dan Kennedy> | 2021-06-23 11:12:48 +0000 |
commit | a261c02d44bd2dad9dad019207c00c3b0e5d00ba (patch) | |
tree | 5427cea01bb4e636ea1705d7af624cfcf68bbd4e /src | |
parent | 415ac68ae8a5c6c9a8806cc34b01101ca0891bd3 (diff) | |
download | sqlite-a261c02d44bd2dad9dad019207c00c3b0e5d00ba.tar.gz sqlite-a261c02d44bd2dad9dad019207c00c3b0e5d00ba.zip |
Fix a problem handling ORDER BY terms of the form "ORDER BY likely(<integer>)" within window frames.
FossilOrigin-Name: 710f75b98bb4ac5bfdfa745c1de832dd1e4d9fb387da52b2f0d1353613f5cdc3
Diffstat (limited to 'src')
-rw-r--r-- | src/window.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/window.c b/src/window.c index 2afa7c12c..f33c51150 100644 --- a/src/window.c +++ b/src/window.c @@ -908,9 +908,7 @@ static ExprList *exprListAppendList( if( bIntToNull ){ int iDummy; Expr *pSub; - for(pSub=pDup; ExprHasProperty(pSub, EP_Skip); pSub=pSub->pLeft){ - assert( pSub ); - } + pSub = sqlite3ExprSkipCollateAndLikely(pDup); if( sqlite3ExprIsInteger(pSub, &iDummy) ){ pSub->op = TK_NULL; pSub->flags &= ~(EP_IntValue|EP_IsTrue|EP_IsFalse); |