aboutsummaryrefslogtreecommitdiff
path: root/src/resolve.c
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2018-07-10 07:39:23 +0000
committerdrh <drh@noemail.net>2018-07-10 07:39:23 +0000
commiteee08611555199aa56aa99f30e0033a124fd9ff7 (patch)
tree246b7a92cb3d95dc4e347fff9dc4c55f54aadb7c /src/resolve.c
parent38630ae1de36db73c4610348592bf616ac116529 (diff)
downloadsqlite-eee08611555199aa56aa99f30e0033a124fd9ff7.tar.gz
sqlite-eee08611555199aa56aa99f30e0033a124fd9ff7.zip
Fix a harmless warning about comment formatting in the previous
check-in. Simplify the ORDER BY dereferencing logic so that it avoids unreachable branches. FossilOrigin-Name: 0f6ec605e131ab3d53b9df32af0a3207146a9abbd22dcabd6ef050b92f96735d
Diffstat (limited to 'src/resolve.c')
-rw-r--r--src/resolve.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/resolve.c b/src/resolve.c
index 13deeca92..5c1dd09be 100644
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -1245,11 +1245,13 @@ static int resolveOrderGroupBy(
if( sqlite3ExprCompare(0, pE, pSelect->pEList->a[j].pExpr, -1)==0 ){
#ifndef SQLITE_OMIT_WINDOWFUNC
if( pE->pWin ){
+ /* Since this window function is being changed into a reference
+ ** to the same window function the result set, remove the instance
+ ** of this window function from the Select.pWin list. */
Window **pp;
for(pp=&pSelect->pWin; *pp; pp=&(*pp)->pNextWin){
if( *pp==pE->pWin ){
*pp = (*pp)->pNextWin;
- break;
}
}
}