diff options
author | stephan <stephan@noemail.net> | 2024-02-27 00:58:51 +0000 |
---|---|---|
committer | stephan <stephan@noemail.net> | 2024-02-27 00:58:51 +0000 |
commit | 32888c2b30cefad8b1bfec91b2b7dba2e2b1513a (patch) | |
tree | 0350a76297a861080ef1e99c9cac523a1352b567 /src/window.c | |
parent | 45cf8ad02a30f76212f7b1c00fa45b00e8626eb6 (diff) | |
parent | f79b0bdcbfb46164cfd665d256f2862bf3f42a7c (diff) | |
download | sqlite-32888c2b30cefad8b1bfec91b2b7dba2e2b1513a.tar.gz sqlite-32888c2b30cefad8b1bfec91b2b7dba2e2b1513a.zip |
Bring the extra-src branch up to date with the trunk.
FossilOrigin-Name: 12ff5c5c4162951a29b638a5bc6cffa50e057c5a5e8f5e9c627af5f4ab1e4cdb
Diffstat (limited to 'src/window.c')
-rw-r--r-- | src/window.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/window.c b/src/window.c index d46eabc3b..62df349fb 100644 --- a/src/window.c +++ b/src/window.c @@ -1038,7 +1038,7 @@ int sqlite3WindowRewrite(Parse *pParse, Select *p){ assert( ExprUseXList(pWin->pOwner) ); assert( pWin->pWFunc!=0 ); pArgs = pWin->pOwner->x.pList; - if( pWin->pWFunc->funcFlags & SQLITE_FUNC_SUBTYPE ){ + if( pWin->pWFunc->funcFlags & SQLITE_SUBTYPE ){ selectWindowRewriteEList(pParse, pMWin, pSrc, pArgs, pTab, &pSublist); pWin->iArgCol = (pSublist ? pSublist->nExpr : 0); pWin->bExprArgs = 1; @@ -1312,8 +1312,9 @@ void sqlite3WindowAttach(Parse *pParse, Expr *p, Window *pWin){ if( p ){ assert( p->op==TK_FUNCTION ); assert( pWin ); + assert( ExprIsFullSize(p) ); p->y.pWin = pWin; - ExprSetProperty(p, EP_WinFunc); + ExprSetProperty(p, EP_WinFunc|EP_FullSize); pWin->pOwner = p; if( (p->flags & EP_Distinct) && pWin->eFrmType!=TK_FILTER ){ sqlite3ErrorMsg(pParse, |