From: dan <Dan Kennedy>
Date: Thu, 14 Mar 2024 19:01:17 +0000 (+0000)
Subject: Fix a problem handling "INSERT INTO ... SELECT ... UNION VALUES(...), (...)" and... 
X-Git-Tag: version-3.46.0~123^2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=400992b1c4e48b10bbfb29301f5582f74e3188a3;p=thirdparty%2Fsqlite.git

Fix a problem handling "INSERT INTO ... SELECT ... UNION VALUES(...), (...)" and similar statements.

FossilOrigin-Name: e8a2a8198a97046ff376bc5d38e4bc0a24fcac79f5a0dadb9d29d953a862a012
---

diff --git a/manifest b/manifest
index 4b2722dbe6..70d506eb4c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Avoid\ssome\sOP_SCopy\sinstructions\sin\s"INSERT\sINTO\s..\sVALUES"\sstatements\sthat\sinsert\smore\sthan\sone\srow\sin\scases\swhere\sthe\sVALUES\sclause\scontains\sa\svalue\sfor\sall\scolumns\sof\sthe\stable.
-D 2024-03-14T17:04:18.708
+C Fix\sa\sproblem\shandling\s"INSERT\sINTO\s...\sSELECT\s...\sUNION\sVALUES(...),\s(...)"\sand\ssimilar\sstatements.
+D 2024-03-14T19:01:17.847
 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 49b1f253248a7492595ee5b602f8b9f8f5bd25037148ca4429b24bd11d9033ed
+F src/insert.c 609b1862f7047c13f5bf531210b6918367e3f594fddd6deb0f9a3bc90aebc1a5
 F src/json.c e2e40760d6689134c3e2ece38c6a496b34ff5e2661a8f238444a119af666fdce
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36
@@ -1921,7 +1921,7 @@ F test/vacuum4.test 7ea76b769fffeb41f925303b04cbcf5a5bbeabe55e4c60ae754ff24eeeb7
 F test/vacuum5.test 263b144d537e92ad8e9ca8a73cc6e1583f41cfd0dda9432b87f7806174a2f48c
 F test/vacuum6.test b137b04bf3392d3f5c3b8fda0ce85a6775a70ca112f6559f74ff52dc9ce042fd
 F test/vacuummem.test 4b30f5b95a9ff86e9d5c20741e50a898b2dc10b0962a3211571eb165357003fb
-F test/values.test 9ec708b15ef0c6a63ece21b2cffcf1bc11cdc96b7fc778e62995de51609afcad
+F test/values.test f888bc7e833cc84258497f2c1b016f04515db00f9ee2e37ea12164eb9c8f47cf
 F test/valuesfault.test 2ef23ed965e3bd08e268cdc38a0d11653390ddbbe1e8e2e98d16f55edd30f6e8
 F test/varint.test bbce22cda8fc4d135bcc2b589574be8410614e62
 F test/veryquick.test 57ab846bacf7b90cf4e9a672721ea5c5b669b661
@@ -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 973d197d9676c066a95cea77a27e36d2d7f5778283919d8cac4424d2ec952f47
-R 35577c4549391d6fa401c7e1873df695
+P 988f0ea70cd21b3194011e0cd1ddd4990a07669e0fd9c37afa48f69698ab7212
+R 15823514808bcf5b8985bdd8c17c3034
 U dan
-Z 98186a481119713b14ebbdd018027220
+Z 3a0769f650aec425942250a7ea141fa5
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 591f868806..9344f0ae07 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-988f0ea70cd21b3194011e0cd1ddd4990a07669e0fd9c37afa48f69698ab7212
\ No newline at end of file
+e8a2a8198a97046ff376bc5d38e4bc0a24fcac79f5a0dadb9d29d953a862a012
\ No newline at end of file
diff --git a/src/insert.c b/src/insert.c
index 3fc5f6ccdb..428d5c1940 100644
--- a/src/insert.c
+++ b/src/insert.c
@@ -1084,7 +1084,10 @@ void sqlite3Insert(
     int regYield;       /* Register holding co-routine entry-point */
     int rc;             /* Result code */
 
-    if( pSelect->pSrc->nSrc==1 && pSelect->pSrc->a[0].fg.viaCoroutine ){
+    if( pSelect->pSrc->nSrc==1 
+     && pSelect->pSrc->a[0].fg.viaCoroutine 
+     && pSelect->pPrior==0
+    ){
       SrcItem *pItem = &pSelect->pSrc->a[0];
       dest.iSDParm = regYield = pItem->regReturn;
       regFromSelect = pItem->regResult;
diff --git a/test/values.test b/test/values.test
index 51fb818a3a..3dba3dda94 100644
--- a/test/values.test
+++ b/test/values.test
@@ -388,5 +388,19 @@ ifcapable fts5 {
     INSERT INTO ft VALUES('one'), ('two');
   }
 }
+
+#-------------------------------------------------------------------------
+reset_db
+do_execsql_test 12.0 {
+  CREATE TABLE t1(a, b);
+}
+do_execsql_test 12.1 {
+  INSERT INTO t1 SELECT 1, 2 UNION ALL VALUES(3, 4), (5, 6);
+}
+do_execsql_test 12.2 {
+  SELECT * FROM t1
+} {1 2 3 4 5 6}
+
+
 finish_test