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;
 }