diff options
| author | drh <drh@noemail.net> | 2019-12-13 12:14:23 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2019-12-13 12:14:23 +0000 |
| commit | ee5b6dd393311c3caa09d7d37b355d620694247e (patch) | |
| tree | ebfd1087da29425b66cf54299432a739166d337e /src | |
| parent | 85d9411c09154932619e77122b3677cd78a44664 (diff) | |
| parent | 2e2c8819f1a9008348b9d04b58ecbe5ebf1ead52 (diff) | |
| download | sqlite-ee5b6dd393311c3caa09d7d37b355d620694247e.tar.gz sqlite-ee5b6dd393311c3caa09d7d37b355d620694247e.zip | |
Merge fixes from trunk.
FossilOrigin-Name: 9c471195f6d3e4b00e2d0f909b306a4036352082dca5f016a8eece226e82163d
Diffstat (limited to 'src')
| -rw-r--r-- | src/resolve.c | 2 | ||||
| -rw-r--r-- | src/sqliteInt.h | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/src/resolve.c b/src/resolve.c index 572e0a9f3..92a937d45 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -973,7 +973,7 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){ Select *pSel = pNC->pWinSelect; assert( pWin==pExpr->y.pWin ); if( IN_RENAME_OBJECT==0 ){ - sqlite3WindowUpdate(pParse, pSel->pWinDefn, pWin, pDef); + sqlite3WindowUpdate(pParse, pSel ? pSel->pWinDefn : 0, pWin, pDef); } sqlite3WalkExprList(pWalker, pWin->pPartition); sqlite3WalkExprList(pWalker, pWin->pOrderBy); diff --git a/src/sqliteInt.h b/src/sqliteInt.h index d022436d3..da9a7ff81 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -1775,12 +1775,6 @@ struct FuncDestructor { #define LIKEFUNC(zName, nArg, arg, flags) \ {nArg, SQLITE_FUNC_CONSTANT|SQLITE_UTF8|flags, \ (void *)arg, 0, likeFunc, 0, 0, 0, #zName, {0} } -#define AGGREGATE(zName, nArg, arg, nc, xStep, xFinal, xValue) \ - {nArg, SQLITE_UTF8|(nc*SQLITE_FUNC_NEEDCOLL), \ - SQLITE_INT_TO_PTR(arg), 0, xStep,xFinal,xValue,0,#zName, {0}} -#define AGGREGATE2(zName, nArg, arg, nc, xStep, xFinal, extraFlags) \ - {nArg, SQLITE_UTF8|(nc*SQLITE_FUNC_NEEDCOLL)|extraFlags, \ - SQLITE_INT_TO_PTR(arg), 0, xStep,xFinal,xFinal,0,#zName, {0}} #define WAGGREGATE(zName, nArg, arg, nc, xStep, xFinal, xValue, xInverse, f) \ {nArg, SQLITE_UTF8|(nc*SQLITE_FUNC_NEEDCOLL)|f, \ SQLITE_INT_TO_PTR(arg), 0, xStep,xFinal,xValue,xInverse,#zName, {0}} |