aboutsummaryrefslogtreecommitdiff
path: root/src/resolve.c
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2019-07-22 19:01:38 +0000
committerdrh <drh@noemail.net>2019-07-22 19:01:38 +0000
commite20945729559e42520d786652c09b00cc9e414f2 (patch)
tree4905674603e2bfb39d86bef6a4cff5a2be7f2dad /src/resolve.c
parente0ae3f69ebae948bf2eadb1b015e75bfb0f3cecc (diff)
downloadsqlite-e20945729559e42520d786652c09b00cc9e414f2.tar.gz
sqlite-e20945729559e42520d786652c09b00cc9e414f2.zip
Consolidate the removal of Window objects from the Select.pWin list into
a single subroutine. FossilOrigin-Name: e46b2afc99329c43de08d4a2e6ade4d2239d7409c5d5626bf272a3e0dd24d1b4
Diffstat (limited to 'src/resolve.c')
-rw-r--r--src/resolve.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/resolve.c b/src/resolve.c
index 48d8fcb9b..672f1356d 100644
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -1305,11 +1305,7 @@ int sqlite3ResolveOrderGroupBy(
static int resolveRemoveWindowsCb(Walker *pWalker, Expr *pExpr){
if( ExprHasProperty(pExpr, EP_WinFunc) ){
Window *pWin = pExpr->y.pWin;
- if( pWin->ppThis ){
- *pWin->ppThis = pWin->pNextWin;
- if( pWin->pNextWin ) pWin->pNextWin->ppThis = pWin->ppThis;
- pWin->ppThis = 0;
- }
+ sqlite3WindowUnlinkFromSelect(pWin);
}
return WRC_Continue;
}