From: drh <drh@noemail.net>
Date: Mon, 14 Dec 2020 13:52:03 +0000 (+0000)
Subject: Minor changes for test coverage.
X-Git-Tag: version-3.35.0~183^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fgeneralized-upsert;p=thirdparty%2Fsqlite.git

Minor changes for test coverage.

FossilOrigin-Name: e5a8fa50f4e5e5c24664452eda4af80904f75e5123b8f84353347dbd505d416d
---

diff --git a/manifest b/manifest
index 3410b246b8..d18f0d5c73 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C More\stest\scases.\s\sNo\snew\sproblems\sdiscovered.
-D 2020-12-12T00:43:52.775
+C Minor\schanges\sfor\stest\scoverage.
+D 2020-12-14T13:52:03.476
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -529,7 +529,7 @@ F src/os_win.c 77d39873836f1831a9b0b91894fec45ab0e9ca8e067dc8c549e1d1eca1566fe9
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c c49952ac5e9cc536778eff528091d79d38b3e45cbeeed4695dc05e207dc6547d
 F src/pager.h 4bf9b3213a4b2bebbced5eaa8b219cf25d4a82f385d093cd64b7e93e5285f66f
-F src/parse.y 72b884c73f2b446e7dc4c7169ec7fbb82e0e292eec733fcf554f0fde46f269f6
+F src/parse.y 6c8aa09a7fa6e0867c3a3d67ef61b911aa392c9b084a61dc632cd93732aef8ad
 F src/pcache.c 385ff064bca69789d199a98e2169445dc16e4291fa807babd61d4890c3b34177
 F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
 F src/pcache1.c 6596e10baf3d8f84cc1585d226cf1ab26564a5f5caf85a15757a281ff977d51a
@@ -608,7 +608,7 @@ F src/tokenize.c 01dba3023659dc6f6b1e054c14b35a0074bd35de10466b99454d33278191d97
 F src/treeview.c 4b92992176fb2caefbe06ba5bd06e0e0ebcde3d5564758da672631f17aa51cda
 F src/trigger.c 515e79206d40d1d4149129318582e79a6e9db590a7b74e226fdb5b2a6c7e1b10
 F src/update.c 9f126204a6acb96bbe47391ae48e0fc579105d8e76a6d9c4fab3271367476580
-F src/upsert.c 5ebb702817ee157badae0548098ea216cc1636e98eda63554e346968565c64c4
+F src/upsert.c df8f1727d62b5987c4fd302cd4d7c0c84ae57cd65683c5a34a740dfe24039235
 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
 F src/util.c c0c7977de7ef9b8cb10f6c85f2d0557889a658f817b0455909a49179ba4c8002
 F src/vacuum.c 492422c1463c076473bae1858799c7a0a5fe87a133d1223239447c422cd26286
@@ -1889,7 +1889,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 f22c21a94ca4cad0217f91c1a5a275bc348cb6ba0f3a54c927533bc8d8c96a90
-R 5a5b9a84e82bccc93a94b5f0a9cd7326
+P f34dd67e2d0dfc9e3b5d49148fb0162853119c097cbc3fe961878875ba98d8e3
+R e4ba77cafc1a5ebe11440b61ff8c6ede
 U drh
-Z 16b3f3b436b8a24d4c2a8d5d463d0b17
+Z 22668862baa080d495b808bc49582152
diff --git a/manifest.uuid b/manifest.uuid
index bf1f11ba9a..22965be8e2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f34dd67e2d0dfc9e3b5d49148fb0162853119c097cbc3fe961878875ba98d8e3
\ No newline at end of file
+e5a8fa50f4e5e5c24664452eda4af80904f75e5123b8f84353347dbd505d416d
\ No newline at end of file
diff --git a/src/parse.y b/src/parse.y
index f28bb47414..faec4b5cf5 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -952,7 +952,12 @@ cmd ::= with insert_cmd(R) INTO xfullname(X) idlist_opt(F) DEFAULT VALUES.
 }
 
 %type upsert {Upsert*}
-%destructor upsert {sqlite3UpsertDelete(pParse->db,$$);}
+
+// Because upsert only occurs at the tip end of the INSERT rule for cmd,
+// there is never a case where the value of the upsert pointer will not
+// be destroyed by the cmd action.  So comment-out the destructor to
+// avoid unreachable code.
+//%destructor upsert {sqlite3UpsertDelete(pParse->db,$$);}
 upsert(A) ::= . { A = 0; }
 upsert(A) ::= ON CONFLICT LP sortlist(T) RP where_opt(TW)
               DO UPDATE SET setlist(Z) where_opt(W) upsert(N).
diff --git a/src/upsert.c b/src/upsert.c
index cb173aa53f..982dc7dbc1 100644
--- a/src/upsert.c
+++ b/src/upsert.c
@@ -216,7 +216,7 @@ int sqlite3UpsertAnalyzeTarget(
 */
 int sqlite3UpsertNextIsIPK(Upsert *pUpsert){
   Upsert *pNext;
-  if( pUpsert==0 ) return 0;
+  if( NEVER(pUpsert==0) ) return 0;
   pNext = pUpsert->pNextUpsert;
   if( pNext==0 ) return 1;
   if( pNext->pUpsertTarget==0 ) return 1;