From: drh <drh@noemail.net>
Date: Sat, 20 Jul 2019 21:12:31 +0000 (+0000)
Subject: Make sure any window definitions in an ORDER BY clause are removed from
X-Git-Tag: version-3.30.0~204^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fd15e18d7fe9bea571c52324a6eae25f3e2b4ebc;p=thirdparty%2Fsqlite.git

Make sure any window definitions in an ORDER BY clause are removed from
the SELECT statement if the ORDER BY clause gets optimized out.

FossilOrigin-Name: 23b119671f0be3c6b72cf2dc5f7707a0626766db7aa56529ab00d33d1a0a1bee
---

diff --git a/manifest b/manifest
index 51512e1885..529dd7cfe5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Early\sdetection\sof\sa\scorrupt\sR-Tree\sin\sthe\sR-Tree\ssearch\salgorithm.
-D 2019-07-20T18:00:46.010
+C Make\ssure\sany\swindow\sdefinitions\sin\san\sORDER\sBY\sclause\sare\sremoved\sfrom\nthe\sSELECT\sstatement\sif\sthe\sORDER\sBY\sclause\sgets\soptimized\sout.
+D 2019-07-20T21:12:31.257
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -520,14 +520,14 @@ F src/pragma.h 4a9fabff14db4487a734dfeeb4be984ce662bfdccfae16145b9c732327735e13
 F src/prepare.c 1fdf68a8add154bd1de978dde5a4819478e2576d5701b93db2c65d78c3daf1c8
 F src/printf.c 9be6945837c839ba57837b4bc3af349eba630920fa5532aa518816defe42a7d4
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
-F src/resolve.c df149546faab3dca0549d3c16abb07fae57126e1394f40ec7cd9129becee6b4e
+F src/resolve.c 78066ab31d1bef84ee08867afc861759a590dcfe87e1096e31bbf094f7e5faf8
 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
-F src/select.c c4b4fe44df6bcf32b693267ae9ec68e1c25f9a29d4a17afebd287d4af2f5fb51
+F src/select.c 2890d92d5d8a4b00092a34dfe03d0acf752972c2ec3443ee519d54f3b18e286b
 F src/shell.c.in a571d51dd7605b34796e9942dce0e895156d1860383faf6aaca3c88b08fe2a43
 F src/sqlite.h.in 83ebc8ab1a2e82d92214006ea2c15bf8a0604f3fac2c31dd9ce9021f568c71f2
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 9ecc93b8493bd20c0c07d52e2ac0ed8bab9b549c7f7955b59869597b650dd8b5
-F src/sqliteInt.h 30dc455dd9591fd9cb31a64ff8a35decfb20fd96a936812459b1cd4eef1748f7
+F src/sqliteInt.h 4d078408e4abf88bee4c620e010bfa06f547df824b28b70cac8bc85d5fcb515f
 F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
 F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
 F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@ -1837,7 +1837,10 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 4e34e3615ff31f4a6432033797b2e1a6604007ea0e501d714ecb362632776150
-R d8a423d78b6859d967916f59be3f03d7
+P 2bf5a4c16457562dc942bcc6ec06d9b4e795ef3ea8e31550e18857bbebd08a76
+R 6add6e706621c6ad32ed71a1edb66a9a
+T *branch * winfunc-in-orderby
+T *sym-winfunc-in-orderby *
+T -sym-trunk *
 U drh
-Z df8d1caa448f0c0227a80eae9d88cd51
+Z ed84c88ba9a0094fa58af4bcbfad001d
diff --git a/manifest.uuid b/manifest.uuid
index 71f68e41c1..e6dccde7f7 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2bf5a4c16457562dc942bcc6ec06d9b4e795ef3ea8e31550e18857bbebd08a76
\ No newline at end of file
+23b119671f0be3c6b72cf2dc5f7707a0626766db7aa56529ab00d33d1a0a1bee
\ No newline at end of file
diff --git a/src/resolve.c b/src/resolve.c
index 87020486ea..cf3d9c339f 100644
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -1295,7 +1295,8 @@ int sqlite3ResolveOrderGroupBy(
 
 #ifndef SQLITE_OMIT_WINDOWFUNC
 /*
-** Walker callback for resolveRemoveWindows().
+** Walker callback for sqlite3WindowRemoveExprFromSelect() and
+** sqlite3WindowRemoveExprListFromSelect()
 */
 static int resolveRemoveWindowsCb(Walker *pWalker, Expr *pExpr){
   if( ExprHasProperty(pExpr, EP_WinFunc) ){
@@ -1314,16 +1315,33 @@ static int resolveRemoveWindowsCb(Walker *pWalker, Expr *pExpr){
 ** Remove any Window objects owned by the expression pExpr from the
 ** Select.pWin list of Select object pSelect.
 */
-static void resolveRemoveWindows(Select *pSelect, Expr *pExpr){
-  Walker sWalker;
-  memset(&sWalker, 0, sizeof(Walker));
-  sWalker.xExprCallback = resolveRemoveWindowsCb;
-  sWalker.u.pSelect = pSelect;
-  sqlite3WalkExpr(&sWalker, pExpr);
+void sqlite3WindowRemoveExprFromSelect(Select *pSelect, Expr *pExpr){
+  if( pSelect->pWin ){
+    Walker sWalker;
+    memset(&sWalker, 0, sizeof(Walker));
+    sWalker.xExprCallback = resolveRemoveWindowsCb;
+    sWalker.u.pSelect = pSelect;
+    sqlite3WalkExpr(&sWalker, pExpr);
+  }
 }
-#else
-# define resolveRemoveWindows(x,y)
-#endif
+
+/*
+** Remove any Window objects owned by the expression list from the
+** Select.pWin list of Select object pSelect.
+*/
+void sqlite3WindowRemoveExprListFromSelect(Select *pSelect, ExprList *pList){
+  if( pList && pSelect->pWin ){
+    int i;
+    Walker sWalker;
+    memset(&sWalker, 0, sizeof(Walker));
+    sWalker.xExprCallback = resolveRemoveWindowsCb;
+    sWalker.u.pSelect = pSelect;
+    for(i=0; i<pList->nExpr; i++){
+      sqlite3WalkExpr(&sWalker, pList->a[i].pExpr);
+    }
+  }
+}
+#endif /* SQLITE_OMIT_WINDOWFUNC */
 
 /*
 ** pOrderBy is an ORDER BY or GROUP BY clause in SELECT statement pSelect.
@@ -1394,7 +1412,7 @@ static int resolveOrderGroupBy(
         /* Since this expresion is being changed into a reference
         ** to an identical expression in the result set, remove all Window
         ** objects belonging to the expression from the Select.pWin list. */
-        resolveRemoveWindows(pSelect, pE);
+        sqlite3WindowRemoveExprFromSelect(pSelect, pE);
         pItem->u.x.iOrderByCol = j+1;
       }
     }
diff --git a/src/select.c b/src/select.c
index 397037b17f..824583c8f4 100644
--- a/src/select.c
+++ b/src/select.c
@@ -5661,6 +5661,7 @@ int sqlite3Select(
            pDest->eDest==SRT_DistQueue || pDest->eDest==SRT_Fifo);
     /* If ORDER BY makes no difference in the output then neither does
     ** DISTINCT so it can be removed too. */
+    sqlite3WindowRemoveExprListFromSelect(p, p->pOrderBy);
     sqlite3ExprListDelete(db, p->pOrderBy);
     p->pOrderBy = 0;
     p->selFlags &= ~SF_Distinct;
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 837e056cf1..0d3e19efc4 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -3627,10 +3627,14 @@ Window *sqlite3WindowListDup(sqlite3 *db, Window *p);
 void sqlite3WindowFunctions(void);
 void sqlite3WindowChain(Parse*, Window*, Window*);
 Window *sqlite3WindowAssemble(Parse*, Window*, ExprList*, ExprList*, Token*);
+void sqlite3WindowRemoveExprFromSelect(Select*,Expr*);
+void sqlite3WindowRemoveExprListFromSelect(Select*,ExprList*);
 #else
 # define sqlite3WindowDelete(a,b)
 # define sqlite3WindowFunctions()
 # define sqlite3WindowAttach(a,b,c)
+# define sqlite3WindowRemoveExprFromSelect(Select*,Expr*);
+# define sqlite3WindowRemoveExprListFromSelect(Select*,ExprList*);
 #endif
 
 /*