From: drh <>
Date: Thu, 14 Jul 2022 01:49:17 +0000 (+0000)
Subject: When applying the omit-ORDER-BY optimization, defer deleting the AST of
X-Git-Tag: version-3.39.2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9dde91f61386e4fc53eb95b6cbd26bf30521225f;p=thirdparty%2Fsqlite.git

When applying the omit-ORDER-BY optimization, defer deleting the AST of
the deleted ORDER BY clause until after code generation ends.

FossilOrigin-Name: b88d6c4b814ec4166ec50f32a2f10d7857df05414c0048c1234ab290a273e50c
---

diff --git a/manifest b/manifest
index f5bae82ba0..a39c24691a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Version\s3.39.1
-D 2022-07-13T19:41:41.164
+C When\sapplying\sthe\somit-ORDER-BY\soptimization,\sdefer\sdeleting\sthe\sAST\sof\nthe\sdeleted\sORDER\sBY\sclause\suntil\safter\scode\sgeneration\sends.
+D 2022-07-14T01:49:17.572
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -570,7 +570,7 @@ F src/printf.c 6166a30417b05c5b2f82e1f183f75faa2926ad60531c0b688a57dbc951441a20
 F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c
 F src/resolve.c 1655e44c77c51ebbe82924287528a78bd4a4aaaf34189dbae28d19ccf2ca615c
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
-F src/select.c 716d552232b09b72c55484d44a9f7ee9b92e9383d3d844f5f8063a52f443afa6
+F src/select.c 92bfb2f08283bb017fa269b4707ceb6f584025abc22caf6c37b59553ff8159ec
 F src/shell.c.in 08e59f1cb9d9b1180aba52861aaada0c95f6ddd210488719684e160a0724c806
 F src/sqlite.h.in 01573eae96721f2a8ee2a9e3b7140ceeba2e9c44350911890b89b8ff0dcf6781
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -1978,10 +1978,9 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P cf9ed7f2e1a7be230a8ff689a759289a6bf59c1c84169f2ed510f74c02e0c2e0
-R 842925abb2bd64a0ede9a65cfdd78360
-T +sym-release *
-T +sym-version-3.39.1 *
+P 7c16541a0efb3985578181171c9f2bb3fdc4bad6a2ec85c6e31ab96f3eff201f
+Q +f22f95b838873f1d2a320afe3d0f4e4847948fcd343097b93a9f684a6f66d6ba
+R 2af90ac342aa007b9e245dba87136969
 U drh
-Z 170755462de7d85803466743500eb5bd
+Z 3a54956676c93646164c9f20f027abcc
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 95201b5839..9236e83694 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7c16541a0efb3985578181171c9f2bb3fdc4bad6a2ec85c6e31ab96f3eff201f
\ No newline at end of file
+b88d6c4b814ec4166ec50f32a2f10d7857df05414c0048c1234ab290a273e50c
\ No newline at end of file
diff --git a/src/select.c b/src/select.c
index 5ebc23fb1f..f14dc9421c 100644
--- a/src/select.c
+++ b/src/select.c
@@ -6840,7 +6840,9 @@ int sqlite3Select(
     ){
       SELECTTRACE(0x100,pParse,p,
                 ("omit superfluous ORDER BY on %r FROM-clause subquery\n",i+1));
-      sqlite3ExprListDelete(db, pSub->pOrderBy);
+      sqlite3ParserAddCleanup(pParse, 
+         (void(*)(sqlite3*,void*))sqlite3ExprListDelete,
+         pSub->pOrderBy);
       pSub->pOrderBy = 0;
     }