From: drh <drh@noemail.net>
Date: Fri, 11 Dec 2020 16:49:51 +0000 (+0000)
Subject: Bug fixes so that legacy tests pass.  New tests for new functionality have
X-Git-Tag: version-3.35.0~183^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ed4c54699df2c2a0494e96dacaf21d279ca0adf2;p=thirdparty%2Fsqlite.git

Bug fixes so that legacy tests pass.  New tests for new functionality have
not yet been added.

FossilOrigin-Name: aa76790e58cea9a2b707f5912fd66c76545e7417442553fc13c87f773a2fe1dd
---

diff --git a/manifest b/manifest
index 5bb77216d5..09d7eda057 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Logic\sis\sin\splace\sto\shandle\smultiple\sON\sCONFLICT\sclauses,\sbut\sit\sdoes\snot\swork.\nAny\suse\sof\sON\sCONFLICT\swill\slikely\slead\sto\smemory\sfaults.\s\sThis\sis\san\nincremental\scheck-in\sto\ssave\smy\splace.
-D 2020-12-11T01:17:06.489
+C Bug\sfixes\sso\sthat\slegacy\stests\spass.\s\sNew\stests\sfor\snew\sfunctionality\shave\nnot\syet\sbeen\sadded.
+D 2020-12-11T16:49:51.732
 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 c8d4bc0dcde4d9d42a1761e919a6a99668000e16840814f8bb643e161894b27f
+F src/insert.c 3f90efe0afbbf4a64f7fe37cb061527a86445f0a1b85a78038ae406b41fbf806
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 8c9c8cd2bd8eecdb06d9b6e89de7e9e65bae45cc8fc33609cc74023a5c296067
 F src/main.c 97e9f137354bc1f76dc9bb60a0a24f8c45cf73b33e80d3ee4c64155336fb820d
@@ -1888,7 +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 64a4a91ecc5dcde3fa07d3cf038c74b9ede63d36628ecfb35203a9dfbbfe113c
-R 750cd21a590114aba81487b95892f11b
+P 155142314feb007d526f8f67723636fd50dc52d1cd4d3a67dd93b105c9d5c2be
+R 63e742ce65925663b08e2a758de8f6e2
 U drh
-Z dd643da8c0e77547922105a9f9bf1ab2
+Z 0aa452b6f5f81d99a0b8c06fa6b89e8a
diff --git a/manifest.uuid b/manifest.uuid
index 7a1e0b0cb8..13c5d7b5a1 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-155142314feb007d526f8f67723636fd50dc52d1cd4d3a67dd93b105c9d5c2be
\ No newline at end of file
+aa76790e58cea9a2b707f5912fd66c76545e7417442553fc13c87f773a2fe1dd
\ No newline at end of file
diff --git a/src/insert.c b/src/insert.c
index 5e59221278..41503224ec 100644
--- a/src/insert.c
+++ b/src/insert.c
@@ -1441,9 +1441,14 @@ struct IndexListTerm {
 
 /* Return the first index on the list */
 static Index *indexIteratorFirst(IndexIterator *pIter, int *pIx){
-  int i = pIter->i;
-  *pIx = i;
-  return pIter->eType ? pIter->u.ax.aIdx[i].p : pIter->u.lx.pIdx;
+  assert( pIter->i==0 );
+  if( pIter->eType ){
+    *pIx = pIter->u.ax.aIdx[0].ix;
+    return pIter->u.ax.aIdx[0].p;
+  }else{
+    *pIx = 0;
+    return pIter->u.lx.pIdx;
+  }
 }
 
 /* Return the next index from the list.  Return NULL when out of indexes */
@@ -2328,7 +2333,10 @@ void sqlite3GenerateConstraintChecks(
     }
     sqlite3VdbeResolveLabel(v, addrUniqueOk);
     if( regR!=regIdx ) sqlite3ReleaseTempRange(pParse, regR, nPkField);
-    if( pUpsertClause && sqlite3UpsertNextIsIPK(pUpsertClause) ){
+    if( pUpsertClause 
+     && upsertIpkReturn
+     && sqlite3UpsertNextIsIPK(pUpsertClause)
+    ){
       sqlite3VdbeGoto(v, upsertIpkDelay+1);
       sqlite3VdbeJumpHere(v, upsertIpkReturn);
     }