diff options
| author | drh <drh@noemail.net> | 2019-12-31 14:49:10 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2019-12-31 14:49:10 +0000 |
| commit | 5f6a2ed7f275a201a8ce9fd81b60a2a552c20f6b (patch) | |
| tree | 0a8359d1c5b0829d9a6292e85665979bf364e076 /src/resolve.c | |
| parent | d335bc40a6576d8759466d8efaaaf82b04667aaa (diff) | |
| parent | 02ff747bc0a6039cddf6108719426d247026fa18 (diff) | |
| download | sqlite-5f6a2ed7f275a201a8ce9fd81b60a2a552c20f6b.tar.gz sqlite-5f6a2ed7f275a201a8ce9fd81b60a2a552c20f6b.zip | |
Merge recent enhancements from trunk.
FossilOrigin-Name: 39d55579376906f212271ce9b2d367e3ad029fb173f22c7253312b467970208a
Diffstat (limited to 'src/resolve.c')
| -rw-r--r-- | src/resolve.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/resolve.c b/src/resolve.c index 92a937d45..3e445fa9a 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -465,7 +465,9 @@ static int lookupName( sqlite3ErrorMsg(pParse, "misuse of aliased aggregate %s", zAs); return WRC_Abort; } - if( (pNC->ncFlags&NC_AllowWin)==0 && ExprHasProperty(pOrig, EP_Win) ){ + if( ExprHasProperty(pOrig, EP_Win) + && ((pNC->ncFlags&NC_AllowWin)==0 || pNC!=pTopNC ) + ){ sqlite3ErrorMsg(pParse, "misuse of aliased window function %s",zAs); return WRC_Abort; } |