From 54f2cd905b2d81e5bbce99d106f95c343b12579b Mon Sep 17 00:00:00 2001
From: drh <drh@noemail.net>
Date: Fri, 13 Apr 2018 16:23:22 +0000
Subject: [PATCH] Remove an always-true branch from the preupdate hook logic.

FossilOrigin-Name: 0ab4518811b23bdb57feba55014cef07de66028f8fcbf8cf0831a712b2954b91
---
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 src/insert.c  | 15 +++++++--------
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/manifest b/manifest
index d6f09a69bf..ef91e54a13 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Help\sthe\sparser\srun\sfaster\sby\savoiding\sthe\s"explain\s::=\s."\sproduction.
-D 2018-04-11T17:10:54.632
+C Remove\san\salways-true\sbranch\sfrom\sthe\spreupdate\shook\slogic.
+D 2018-04-13T16:23:22.787
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 7016fc56c6b9bfe5daac4f34be8be38d8c0b5fab79ccbfb764d3b23bf1c6fff3
@@ -452,7 +452,7 @@ F src/hash.c a12580e143f10301ed5166ea4964ae2853d3905a511d4e0c44497245c7ce1f7a
 F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
 F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
-F src/insert.c b9ff71cc2913d1d57698a1e22bf853261a9a642baf62bdf40ddeb3809adb85b5
+F src/insert.c 752740e4619416d4262f6e9e51cdb6af5965eb0c8e943832a5af77d41e2839c7
 F src/legacy.c 134ab3e3fae00a0f67a5187981d6935b24b337bcf0f4b3e5c9fa5763da95bf4e
 F src/loadext.c f6e4e416a736369f9e80eba609f0acda97148a8b0453784d670c78d3eed2f302
 F src/main.c 1648fc7a9bcfdbfd9a9a04af96ff2796c3164b3f3c7e56ed63a3c51cd11d198d
@@ -1717,7 +1717,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 b7178209152452e82f5908513385018524472640d67547927d6b4c0aa0c15a46
-R 12b886afc6216ee0a5a2b22cc4bff5a5
+P d7ec7b5970df9e542401f8299e098a5039d1875e2e3383dad06a0ec998589b6e
+R f9cb5caefaf1e23db60ecde977cce853
 U drh
-Z 93376c77c8408e036fdadd56852c955d
+Z 2e05817b48e1d8380863fbfa532bc935
diff --git a/manifest.uuid b/manifest.uuid
index c807fee2e0..8a952e019d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d7ec7b5970df9e542401f8299e098a5039d1875e2e3383dad06a0ec998589b6e
\ No newline at end of file
+0ab4518811b23bdb57feba55014cef07de66028f8fcbf8cf0831a712b2954b91
\ No newline at end of file
diff --git a/src/insert.c b/src/insert.c
index 9f7032c52c..7124e6658e 100644
--- a/src/insert.c
+++ b/src/insert.c
@@ -1450,14 +1450,13 @@ void sqlite3GenerateConstraintChecks(
                                    regNewData, 1, 0, OE_Replace, 1, -1);
         }else{
 #ifdef SQLITE_ENABLE_PREUPDATE_HOOK
-          if( HasRowid(pTab) ){
-            /* This OP_Delete opcode fires the pre-update-hook only. It does
-            ** not modify the b-tree. It is more efficient to let the coming
-            ** OP_Insert replace the existing entry than it is to delete the
-            ** existing entry and then insert a new one. */
-            sqlite3VdbeAddOp2(v, OP_Delete, iDataCur, OPFLAG_ISNOOP);
-            sqlite3VdbeAppendP4(v, pTab, P4_TABLE);
-          }
+          assert( HasRowid(pTab) );
+          /* This OP_Delete opcode fires the pre-update-hook only. It does
+          ** not modify the b-tree. It is more efficient to let the coming
+          ** OP_Insert replace the existing entry than it is to delete the
+          ** existing entry and then insert a new one. */
+          sqlite3VdbeAddOp2(v, OP_Delete, iDataCur, OPFLAG_ISNOOP);
+          sqlite3VdbeAppendP4(v, pTab, P4_TABLE);
 #endif /* SQLITE_ENABLE_PREUPDATE_HOOK */
           if( pTab->pIndex ){
             sqlite3MultiWrite(pParse);