From: dan <Dan Kennedy>
Date: Wed, 13 Mar 2024 15:44:31 +0000 (+0000)
Subject: Ensure that if a multi-row VALUES cannot be coded while being parsed, the SF_MultiVal... 
X-Git-Tag: version-3.46.0~123^2~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e116fa153f752192ce96e285f7a3685549e0e2a4;p=thirdparty%2Fsqlite.git

Ensure that if a multi-row VALUES cannot be coded while being parsed, the SF_MultiValue flag is correctly set.

FossilOrigin-Name: 94791824a6f04782aac6bc16c182685e2d6ebf5c688dc9f8d59e479c6fd5a40e
---

diff --git a/manifest b/manifest
index 1eef7fdddb..fc5a54bd05 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Avoid\screating\sa\sco-routine\sincrementally\sfor\sa\sVALUES\sclause\sthat\shas\saffinities\sother\sthan\sNONE.
-D 2024-03-13T15:34:44.818
+C Ensure\sthat\sif\sa\smulti-row\sVALUES\scannot\sbe\scoded\swhile\sbeing\sparsed,\sthe\sSF_MultiValue\sflag\sis\scorrectly\sset.
+D 2024-03-13T15:44:31.439
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -709,7 +709,7 @@ F src/hash.c 9ee4269fb1d6632a6fecfb9479c93a1f29271bddbbaf215dd60420bcb80c7220
 F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
 F src/hwtime.h f9c2dfb84dce7acf95ce6d289e46f5f9d3d1afd328e53da8f8e9008e3b3caae6
 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
-F src/insert.c aef8d3dfc86116e0226a90549b5fbe8c63cda51eaca01d22f4d16e7b4e554a1b
+F src/insert.c 88f3c98b0ebbee295bb5085753bdb64ef1546ee5f0f0100b8be4f756b8a1acc6
 F src/json.c e2e40760d6689134c3e2ece38c6a496b34ff5e2661a8f238444a119af666fdce
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36
@@ -2179,8 +2179,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 c32953ff6d72910815eaff29ab1b790c412e1a741d02c03c5911dda0c08e5130
-R 919d468c68cfa043ffb3132b71e307d6
+P 4229b12b327b05561dcf49b8585a66467d17d4e998b14eff65eb886f2434b53c
+R 759c4fdaf4045c9f2dff7c53c191816c
 U dan
-Z 074e750da48e105e4f7bff52672dad88
+Z 9143cafae67b08f919f57c93acfe5550
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index e4e6f66f77..bd6f8334d3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4229b12b327b05561dcf49b8585a66467d17d4e998b14eff65eb886f2434b53c
\ No newline at end of file
+94791824a6f04782aac6bc16c182685e2d6ebf5c688dc9f8d59e479c6fd5a40e
\ No newline at end of file
diff --git a/src/insert.c b/src/insert.c
index 10eafaa413..7303e1950a 100644
--- a/src/insert.c
+++ b/src/insert.c
@@ -616,13 +616,16 @@ Select *sqlite3MultiValues(Parse *pParse, Select *pLeft, ExprList *pRow){
    || pLeft->pPrior
    || (pLeft->pSrc->nSrc==0 && multiValueIsConstantNoAff(pLeft->pEList)==0)
   ){
+    /* This row of the VALUES clause cannot be coded immediately. */
     int f = SF_Values | SF_MultiValue;
-    if( pLeft->pPrior || pLeft->pSrc->nSrc ){
+    if( pLeft->pSrc->nSrc ){
       sqlite3MultiValuesEnd(pParse, pLeft);
       f = SF_Values;
+    }else if( pLeft->pPrior ){
+      /* In this case set the SF_MultiValue flag only if it was set on
+      ** the previous Select structure. */
+      f = (f & pLeft->selFlags);
     }
-    /* This VALUES clause is part of a VIEW or some other schema item. In
-    ** this case the co-routine cannot be coded immediately.  */
     pSelect = sqlite3SelectNew(pParse,pRow,0,0,0,0,0,f,0);
     pLeft->selFlags &= ~SF_MultiValue;
     if( pSelect ){