Do not flatten sub-queries that contain window functions.
FossilOrigin-Name: 236cb75bd1f0d5eb86aa5f52d8d548e7263c34633833dcea9dfc934f142113b8
diff --git a/src/expr.c b/src/expr.c
index 54e9ced..af4201e 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -1182,24 +1182,6 @@
return nByte;
}
-static Window *winDup(sqlite3 *db, Window *p){
- Window *pNew = 0;
- if( p ){
- pNew = sqlite3DbMallocZero(db, sizeof(Window));
- if( pNew ){
- pNew->pFilter = sqlite3ExprDup(db, p->pFilter, 0);
- pNew->pPartition = sqlite3ExprListDup(db, p->pPartition, 0);
- pNew->pOrderBy = sqlite3ExprListDup(db, p->pOrderBy, 0);
- pNew->eType = p->eType;
- pNew->eEnd = p->eEnd;
- pNew->eStart = p->eStart;
- pNew->pStart = sqlite3ExprDup(db, pNew->pStart, 0);
- pNew->pEnd = sqlite3ExprDup(db, pNew->pEnd, 0);
- }
- }
- return pNew;
-}
-
/*
** This function is similar to sqlite3ExprDup(), except that if pzBuffer
** is not NULL then *pzBuffer is assumed to point to a buffer large enough
@@ -1289,7 +1271,7 @@
if( ExprHasProperty(p, EP_Reduced|EP_TokenOnly) ){
pNew->pWin = 0;
}else{
- pNew->pWin = winDup(db, p->pWin);
+ pNew->pWin = sqlite3WindowDup(db, p->pWin);
}
if( !ExprHasProperty(p, EP_TokenOnly|EP_Leaf) ){
if( pNew->op==TK_SELECT_COLUMN ){