From: drh <>
Date: Wed, 1 Mar 2023 13:54:07 +0000 (+0000)
Subject: Do not attempt to apply the count-of-view optimization to a CTE.
X-Git-Tag: version-3.42.0~303
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=46960e4677ec68a7b4139a9310d5d728bd25ef03;p=thirdparty%2Fsqlite.git

Do not attempt to apply the count-of-view optimization to a CTE.
dbsqlfuzz ef8623915d843b150c159166ee4548c78cc6895a

FossilOrigin-Name: abc3a383636c0346053b5d09d96585f56c64cacb5751673ea3bf339e4955d1cd
---

diff --git a/manifest b/manifest
index d19318bff0..41e2b25304 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Activate\sSQLITE_DBCONFIG_STMT_SCANSTATUS\sin\sfuzzcheck.
-D 2023-02-28T21:23:46.457
+C Do\snot\sattempt\sto\sapply\sthe\scount-of-view\soptimization\sto\sa\sCTE.\ndbsqlfuzz\sef8623915d843b150c159166ee4548c78cc6895a
+D 2023-03-01T13:54:07.942
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -623,7 +623,7 @@ F src/printf.c fb31597cf93200eba9167573094ee312b0d51b2c1998613284ceb2c8c212b492
 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c d62c5665279cc7485f9d45b5e20911cc7b19c203f268321a90d05d74f4725750
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
-F src/select.c 230dc0601f55ae4909b5f88bc002bfa1f1fb331e51f2c6d670d3effc2ced365e
+F src/select.c 1d9a7c3b60e1e20bd4b5b6c0df0b2fe0958e04fa01b3dedd87c10468bada62e0
 F src/shell.c.in af928afa0376b2e2c962be9a0a3ab716b3983b1adfae10e248ffd40ede03b049
 F src/sqlite.h.in dd0f802db5ce8b2e384cf1e04debe175b38ab5ba2c8e09f00672e8b79a1bb134
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -893,7 +893,7 @@ F test/corruptM.test 7d574320e08c1b36caa3e47262061f186367d593a7e305d35f15289cc2c
 F test/corruptN.test 7c099d153a554001b4fb829c799b01f2ea6276cbc32479131e0db0da4efd9cc4
 F test/cost.test b11cdbf9f11ffe8ef99c9881bf390e61fe92baf2182bad1dbe6de59a7295c576
 F test/count.test cd4bd531066e8d77ef8fe1e3fc8253d042072e117ccab214b290cf83f1602249
-F test/countofview.test e17d6e6688cf74f22783c9ec6e788c0790ee4fbbaee713affd00b1ac0bb39b86
+F test/countofview.test 5773d192f67bbf271f53ebb1f3292f435c9c7ae91ee0be83f81591c19a983604
 F test/coveridxscan.test f35c7208dedc4f98e471c569df64c0f95a49f6e072d8dc7c8f99bdee2697de1b
 F test/crash.test fb9dc4a02dcba30d4aa5c2c226f98b220b2b959f
 F test/crash2.test 5b14d4eb58b880e231361d3b609b216acda86651
@@ -2048,8 +2048,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 bd02df052e1ef78b5335915a38f3c5e13c3c04ab82fd251aeb42a440d1d39257
-R 8576dd179593a779804154045c49523d
+P 4fe1419ac3161ea8735241b04913593170c636cf3e1583756fe94edd396cd38b
+R 8eb90f4d18319eb19774d62b004fc1bc
 U drh
-Z 6457a01da04b4d92486c2ec77b55c596
+Z 423142ebb5d4ee37849ae60a48c54522
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 73bfb25b5b..a6dc47513d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4fe1419ac3161ea8735241b04913593170c636cf3e1583756fe94edd396cd38b
\ No newline at end of file
+abc3a383636c0346053b5d09d96585f56c64cacb5751673ea3bf339e4955d1cd
\ No newline at end of file
diff --git a/src/select.c b/src/select.c
index a882b973ee..82d195de3e 100644
--- a/src/select.c
+++ b/src/select.c
@@ -6876,7 +6876,8 @@ static int countOfViewOptimization(Parse *pParse, Select *p){
   if( ExprHasProperty(pExpr, EP_WinFunc) ) return 0;/* Not a window function */
   pSub = p->pSrc->a[0].pSelect;
   if( pSub==0 ) return 0;                           /* The FROM is a subquery */
-  if( pSub->pPrior==0 ) return 0;                   /* Must be a compound ry */
+  if( pSub->pPrior==0 ) return 0;                   /* Must be a compound */
+  if( pSub->selFlags & SF_CopyCte ) return 0;       /* Not a CTE */
   do{
     if( pSub->op!=TK_ALL && pSub->pPrior ) return 0;  /* Must be UNION ALL */
     if( pSub->pWhere ) return 0;                      /* No WHERE clause */
diff --git a/test/countofview.test b/test/countofview.test
index 0ee511ff34..c7783e6dbd 100644
--- a/test/countofview.test
+++ b/test/countofview.test
@@ -51,6 +51,14 @@ do_execsql_test 2.1 {
   SELECT count(*) FROM v1 GROUP BY y;
 } {3 3}
 
-
+# 2023-03-01 dbsqlfuzz ef8623915d843b150c159166ee4548c78cc6895a
+# count-of-view should not apply to CTEs.
+#
+proc progress_stop args {return 1}
+db progress 1000 progress_stop
+do_catchsql_test 3.1 {
+  WITH RECURSIVE c(x) AS (VALUES(1) UNION ALL SELECT x+1 FROM c)
+  SELECT count(*) FROM c;
+} {1 interrupted}
 
 finish_test