From: drh <>
Date: Wed, 2 Aug 2023 00:09:15 +0000 (+0000)
Subject: When a query is inside an AS MATERIALIZED CTE, do not attempt the
X-Git-Tag: version-3.43.0~78^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4178849736c81ec17bbfb2628ec0ef7bad94962d;p=thirdparty%2Fsqlite.git

When a query is inside an AS MATERIALIZED CTE, do not attempt the
omit-ORDER-BY optimization.  If the developer specifies MATERIALIZED,
that means he wants the sort to actually happen.

FossilOrigin-Name: aa769ee7477171f26a091cadff98aa4f48da7752ade20b405a95c4525456f62e
---

diff --git a/manifest b/manifest
index 6111b63076..d796df9ebc 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Avoid\sASAN\swarnings\swhen\sconverting\sover-sized\slong\sdouble\svalues\sinto\sdouble.
-D 2023-08-01T19:10:30.602
+C When\sa\squery\sis\sinside\san\sAS\sMATERIALIZED\sCTE,\sdo\snot\sattempt\sthe\nomit-ORDER-BY\soptimization.\s\sIf\sthe\sdeveloper\sspecifies\sMATERIALIZED,\nthat\smeans\she\swants\sthe\ssort\sto\sactually\shappen.
+D 2023-08-02T00:09:15.460
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -643,7 +643,7 @@ F src/printf.c e3ba080e2f409f9bfcc8d34724e6fc160e9c718dc92d0548f6b71b8b6f860ce2
 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 37953a5f36c60bea413c3c04efcd433b6177009f508ef2ace0494728912fe2e9
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
-F src/select.c 3328b8c758016b400a4fea053ab1f5927929083a49d0c3921802ce99eea73cde
+F src/select.c 0ea15e379b2eb09d1a803499438b957c59af7264996903ec9b9a4aeb0402293b
 F src/shell.c.in 694aaf751f00610381533d4a31c83d142cfc83ef91ef65e2aa6912ace7c39b40
 F src/sqlite.h.in 7b07a33d2af82ee974aa91e6294abce0282b2f4c5934b291d2fff961810dd867
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -2049,8 +2049,11 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P ef7c121049f77200ecc4da260a90776264af0e84122d0133b4986959aedc653a
-R c483adf60f57a6109b239d1712365b26
+P e989a37ff9d5b52e0090d59be077ad2260c8df5d4c2c2d8088b1160de64dffd4
+R 85471d4376eb004f17191da107252ebb
+T *branch * materialize-order-by
+T *sym-materialize-order-by *
+T -sym-trunk *
 U drh
-Z 2befc2bb54d1f8208d12f5236dacb8de
+Z 34b88ebfe26392ded7967d5b47a75b8d
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index feb55dd783..1b72fd535b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e989a37ff9d5b52e0090d59be077ad2260c8df5d4c2c2d8088b1160de64dffd4
\ No newline at end of file
+aa769ee7477171f26a091cadff98aa4f48da7752ade20b405a95c4525456f62e
\ No newline at end of file
diff --git a/src/select.c b/src/select.c
index 098b745849..7f73b19287 100644
--- a/src/select.c
+++ b/src/select.c
@@ -7314,12 +7314,14 @@ int sqlite3Select(
     **            (a)  The outer query has a different ORDER BY clause
     **            (b)  The subquery is part of a join
     **          See forum post 062d576715d277c8
+    **    (6)   The subquery is really a MATERIALIZED CTE
     */
     if( pSub->pOrderBy!=0
      && (p->pOrderBy!=0 || pTabList->nSrc>1)      /* Condition (5) */
      && pSub->pLimit==0                           /* Condition (1) */
      && (pSub->selFlags & SF_OrderByReqd)==0      /* Condition (2) */
      && (p->selFlags & SF_OrderByReqd)==0         /* Condition (3) and (4) */
+     && (pItem->fg.isCte==0 || pItem->u2.pCteUse->eM10d!=M10d_Yes) /* (6) */
      && OptimizationEnabled(db, SQLITE_OmitOrderBy)
     ){
       TREETRACE(0x800,pParse,p,