aboutsummaryrefslogtreecommitdiff
path: root/src/resolve.c
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2019-03-29 01:15:11 +0000
committerdrh <drh@noemail.net>2019-03-29 01:15:11 +0000
commitd137f4e6e5b7d7715a0a752c88dd4af533f9b352 (patch)
treef278aa9965e396aaf00bc94237b36d20bab772df /src/resolve.c
parentf72a97925d6a382a58cef98510c8bc430e91ee25 (diff)
downloadsqlite-d137f4e6e5b7d7715a0a752c88dd4af533f9b352.tar.gz
sqlite-d137f4e6e5b7d7715a0a752c88dd4af533f9b352.zip
Recover a some of the performance lost by window function alias fix two
check-ins back. FossilOrigin-Name: 965cbcea117835d2c6d2ec58c8025b227f491c35805e282cb31228436bc6bec1
Diffstat (limited to 'src/resolve.c')
-rw-r--r--src/resolve.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/resolve.c b/src/resolve.c
index eb9e137fd..50755e59f 100644
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -1673,12 +1673,11 @@ int sqlite3ResolveExprNames(
#if SQLITE_MAX_EXPR_DEPTH>0
w.pParse->nHeight -= pExpr->nHeight;
#endif
- if( pNC->ncFlags & NC_HasAgg ){
- ExprSetProperty(pExpr, EP_Agg);
- }
- if( pNC->ncFlags & NC_HasWin ){
- ExprSetProperty(pExpr, EP_Win);
- }
+ assert( EP_Agg==NC_HasAgg );
+ assert( EP_Win==NC_HasWin );
+ testcase( pNC->ncFlags & NC_HasAgg );
+ testcase( pNC->ncFlags & NC_HasWin );
+ ExprSetProperty(pExpr, pNC->ncFlags & (NC_HasAgg|NC_HasWin) );
pNC->ncFlags |= savedHasAgg;
return pNC->nErr>0 || w.pParse->nErr>0;
}