From: drh <drh@noemail.net>
Date: Tue, 29 Oct 2019 03:30:26 +0000 (+0000)
Subject: Add a missing translation from table column numbers to storage table numbers
X-Git-Tag: version-3.31.0~368
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b6d861e523f7b34a6c9f4603a5bfe18fe323d00a;p=thirdparty%2Fsqlite.git

Add a missing translation from table column numbers to storage table numbers
while processing constraints on an UPDATE statement.
Ticket [9621dd78a024d07a]

FossilOrigin-Name: 361ea81ae8a13e7d2ec4c2412f30e049bb6ee320980d502c86bedc315cdd3bc0
---

diff --git a/manifest b/manifest
index f8e9e7ea21..d0d6397ee6 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Disallow\stables\sthat\shave\sonly\svirtual\scolumns.
-D 2019-10-29T01:26:24.071
+C Add\sa\smissing\stranslation\sfrom\stable\scolumn\snumbers\sto\sstorage\stable\snumbers\nwhile\sprocessing\sconstraints\son\san\sUPDATE\sstatement.\nTicket\s[9621dd78a024d07a]
+D 2019-10-29T03:30:26.054
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -487,7 +487,7 @@ F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19
 F src/hash.h 9d56a9079d523b648774c1784b74b89bd93fac7b365210157482e4319a468f38
 F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
-F src/insert.c dfb4a734327097ee8e61c2668227e6dc57b35018a24da07d2c19efef573a4b80
+F src/insert.c eb81303edba6d2e9cbead33260db01c6c6fcf3f21e6c83f454b6807254bf0186
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 4ddc65ae13c0d93db0ceedc8b14a28c8c260513448b0eb8c5a2ac375e3b6a85d
 F src/main.c 3e01f6a1c96643381b5f9d79e4ff7f2520bc5712197746fb0852283e78cccf66
@@ -1848,7 +1848,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 0b0a3048f9df88bbc8979f2ac5247bee7d7bc1e585faca252610d2fcbe36d51d
-R b4c27cbc6097f72a61ec6b82e9ea7ae9
+P 591973217f1caf24cde91dc15b7edca2edda05dac8ae2b2cd8d71e7aa072f7d1
+R 24e97e0296b21647315af04b485f5143
 U drh
-Z 4276087abce170d1b1843b56d4d084ed
+Z 5b847cd00fe978f8703699f99d27a61c
diff --git a/manifest.uuid b/manifest.uuid
index cd3e1f59ce..0b78352e11 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-591973217f1caf24cde91dc15b7edca2edda05dac8ae2b2cd8d71e7aa072f7d1
\ No newline at end of file
+361ea81ae8a13e7d2ec4c2412f30e049bb6ee320980d502c86bedc315cdd3bc0
\ No newline at end of file
diff --git a/src/insert.c b/src/insert.c
index 8d53bafe72..0711930fb4 100644
--- a/src/insert.c
+++ b/src/insert.c
@@ -1982,6 +1982,7 @@ void sqlite3GenerateConstraintChecks(
               addrJump = addrUniqueOk;
               op = OP_Eq;
             }
+            x = sqlite3TableColumnToStorage(pTab, x);
             sqlite3VdbeAddOp4(v, op, 
                 regOldData+1+x, addrJump, regCmp+i, p4, P4_COLLSEQ
             );