Remove unnecessary conditionals around the ORDER BY resolver calls in

multiSelectOrderBy().

FossilOrigin-Name: f2887e018be71bc406526935c7e99e42f12fc5d1d1c65a89dc2b9bfbca01d43d

diff --git a/manifest b/manifest
index a869e1965ac3b0419b1be2dcfba67c05b9fc42e4..e50c8478d07e20de6f0744da8a220a9783b083cc 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C When\sconstructing\sthe\ssqlite3_index_info\sobject\sfor\sthe\sxBestIndex\smethod\nof\sa\svirtual\stable,\somit\sconstant\strims\sfrom\sthe\sORDER\sBY\sclause,\sas\sthey\nwill\salways\sbe\sin\sthe\scorrect\sorder.
-D 2021-12-30T17:36:54.703
+C Remove\sunnecessary\sconditionals\saround\sthe\sORDER\sBY\sresolver\scalls\sin\nmultiSelectOrderBy().
+D 2021-12-30T17:46:15.485
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -550,7 +550,7 @@ F src/printf.c 975f1f5417f2526365b6e6d7f22332e3e11806dad844701d92846292b654ba9a
 F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c
 F src/resolve.c 359bc0e445d427583d2ab6110433a5dc777f64a0ecdf8d24826d8b475233ead9
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
-F src/select.c bc130367361e68d3705e0756f913bb8433bccfb0187e0756455308c558b5699a
+F src/select.c 342e096c2737a3ee60753e91de6e6660c7f59cd2988b3e1ab641d38fd885003f
 F src/shell.c.in 41b0e1f3a0c2443cb0a8d25e5d40529c911c574b5fe5a91dc54e19f90947a359
 F src/sqlite.h.in a5e0d6bd47e67aabf1475986d36bdcc7bfa9e06566790ebf8e3aa7fa551c9f99
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -1935,8 +1935,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 2f09b51b1ff37bf98f958564cc1224968caa7e33147e6666b5c1ba20b2a7813b
-R 723804026d511a012324b02198fe2bb2
+P 524c2b87d74c8cad6fb377aed7275788d61beafe61e675480de732519987102c
+R f797199d3004b4800cca92d57aa013a0
 U drh
-Z 6d2de5fa4529370d9c153afd0702b588
+Z 2ac044172bdb3856fa63346532f0ce74
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 52a3dfcf19632916bb750da06c29dd70bdf54b50..6462eeb7cf33d0eb1627701ba7c86ec532e8e297 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-524c2b87d74c8cad6fb377aed7275788d61beafe61e675480de732519987102c
\ No newline at end of file
+f2887e018be71bc406526935c7e99e42f12fc5d1d1c65a89dc2b9bfbca01d43d
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index b89f09a958e1c4287d9fd459baf8e51c019599f2..c33903f107ad266624c33127c18c7d5d209f38ac 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -3438,12 +3438,8 @@ static int multiSelectOrderBy(
   assert( p->pOrderBy == pOrderBy );
   assert( pOrderBy!=0 || db->mallocFailed );
   pPrior->pOrderBy = sqlite3ExprListDup(pParse->db, pOrderBy, 0);
-  if( p->pPrior==0 ){
-    sqlite3ResolveOrderGroupBy(pParse, p, p->pOrderBy, "ORDER");
-  }
-  if( pPrior->pPrior==0 ){
-    sqlite3ResolveOrderGroupBy(pParse, pPrior, pPrior->pOrderBy, "ORDER");
-  }
+  sqlite3ResolveOrderGroupBy(pParse, p, p->pOrderBy, "ORDER");
+  sqlite3ResolveOrderGroupBy(pParse, pPrior, pPrior->pOrderBy, "ORDER");
 
   /* Compute the limit registers */
   computeLimitRegisters(pParse, p, labelEnd);