From: drh <drh@noemail.net>
Date: Wed, 9 Dec 2020 01:34:48 +0000 (+0000)
Subject: Initialize all terms in the ON CONFLICT clause stack.
X-Git-Tag: version-3.35.0~183^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=20b86324a1b3c78b5eee3872d1934ec21c911bfa;p=thirdparty%2Fsqlite.git

Initialize all terms in the ON CONFLICT clause stack.

FossilOrigin-Name: 5e683fd1cbde53f37cf8a2b1e981191e2b29e3376db554691767f33c37c7547e
---

diff --git a/manifest b/manifest
index 9471059ac9..b6cfaef7fe 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhance\sUPSERT\sparsing\sto\sallow\smultiple\sON\sCONFLICT\sclauses.\s\sOnly\sthe\nvery\slast\sclause\smay\somit\sthe\sconflict\starget,\sbut\sthe\sconflict\starget\smay\nnow\sbe\somitted\sfor\sthe\sDO\sUPDATE\sresolution.
-D 2020-12-08T14:29:03.533
+C Initialize\sall\sterms\sin\sthe\sON\sCONFLICT\sclause\sstack.
+D 2020-12-09T01:34:48.233
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -501,7 +501,7 @@ F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19
 F src/hash.h 9d56a9079d523b648774c1784b74b89bd93fac7b365210157482e4319a468f38
 F src/hwtime.h cb1d7e3e1ed94b7aa6fde95ae2c2daccc3df826be26fc9ed7fd90d1750ae6144
 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
-F src/insert.c 7e081d33aab4a9d761c39dccf3c3872c35501565d2ed9db66301918d23bc7901
+F src/insert.c 2fdfd14bf872501f041cb2220632dace2df63342151b9b30ebfb798df3f14632
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 8c9c8cd2bd8eecdb06d9b6e89de7e9e65bae45cc8fc33609cc74023a5c296067
 F src/main.c 97e9f137354bc1f76dc9bb60a0a24f8c45cf73b33e80d3ee4c64155336fb820d
@@ -1888,10 +1888,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 4b286129138d44e6f8e9b3450289941e01d20fdfb9d0b5d846031425e8ca6b49
-R 204aa888c3a8b96c5008bc9a579603f7
-T *branch * generalized-upsert
-T *sym-generalized-upsert *
-T -sym-trunk *
+P 2ca62f4c71df6544cb8039bdc80e3701d09697c38800534371f6d44532fcffae
+R 522b57bc98ce1a3ca7ad7f44cd4944b4
 U drh
-Z d13edca14ac31a65fc7ae7d7fdc7eaff
+Z 6380cbc8ce17e23f96dde835eaec54ed
diff --git a/manifest.uuid b/manifest.uuid
index 0eeaf11f2a..f0390ac713 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2ca62f4c71df6544cb8039bdc80e3701d09697c38800534371f6d44532fcffae
\ No newline at end of file
+5e683fd1cbde53f37cf8a2b1e981191e2b29e3376db554691767f33c37c7547e
\ No newline at end of file
diff --git a/src/insert.c b/src/insert.c
index 393cd528f1..137590a5e5 100644
--- a/src/insert.c
+++ b/src/insert.c
@@ -975,6 +975,7 @@ void sqlite3Insert(
   }
 #ifndef SQLITE_OMIT_UPSERT
   if( pUpsert ){
+    Upsert *pNx;
     if( IsVirtual(pTab) ){
       sqlite3ErrorMsg(pParse, "UPSERT not implemented for virtual table \"%s\"",
               pTab->zName);
@@ -988,13 +989,17 @@ void sqlite3Insert(
       goto insert_cleanup;
     }
     pTabList->a[0].iCursor = iDataCur;
-    pUpsert->pUpsertSrc = pTabList;
-    pUpsert->regData = regData;
-    pUpsert->iDataCur = iDataCur;
-    pUpsert->iIdxCur = iIdxCur;
-    if( pUpsert->pUpsertTarget ){
-      sqlite3UpsertAnalyzeTarget(pParse, pTabList, pUpsert);
-    }
+    pNx = pUpsert;
+    do{
+      pNx->pUpsertSrc = pTabList;
+      pNx->regData = regData;
+      pNx->iDataCur = iDataCur;
+      pNx->iIdxCur = iIdxCur;
+      if( pNx->pUpsertTarget ){
+        sqlite3UpsertAnalyzeTarget(pParse, pTabList, pNx);
+      }
+      pNx = pNx->pNextUpsert;
+    }while( pNx!=0 );
   }
 #endif