From: drh <drh@noemail.net>
Date: Thu, 17 Oct 2019 18:07:22 +0000 (+0000)
Subject: Bug fix with INSERT using an explicit column list on a table with
X-Git-Tag: version-3.31.0~376^2~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d4cd292c2aa7e453ee3879d47df0c0503b47db75;p=thirdparty%2Fsqlite.git

Bug fix with INSERT using an explicit column list on a table with
a non-final STORED column.

FossilOrigin-Name: 61b4459ae6a6cc182c11abbc8b1dd629f77beb088d7ccad5e563d8d4769056df
---

diff --git a/manifest b/manifest
index 48bf19ebc6..9ad58ca2f9 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Some\s(but\snot\sall)\sINSERT\sand\sUPDATE\sstatements\snow\swork\sfor\sSTORED\scolumns.
-D 2019-10-17T17:54:05.733
+C Bug\sfix\swith\sINSERT\susing\san\sexplicit\scolumn\slist\son\sa\stable\swith\na\snon-final\sSTORED\scolumn.
+D 2019-10-17T18:07:22.142
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -486,7 +486,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 2402847e031cb9b1e95a776481706a38833339be1142e8bdc78fd59e65d7c87c
+F src/insert.c 603a076777fc517847c55bcb5e6ab96191c1727ef4bf353f7154f2770cd352c2
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 4ddc65ae13c0d93db0ceedc8b14a28c8c260513448b0eb8c5a2ac375e3b6a85d
 F src/main.c 3e01f6a1c96643381b5f9d79e4ff7f2520bc5712197746fb0852283e78cccf66
@@ -1847,7 +1847,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 8f67b89b04622c1509dc102a83be7a80057dc791625804fc2c294089c98b97e4
-R f8d479928377499694b42044f6469958
+P fe7517bf4d360597576ab9aba29627d7926d23f2bbbfb3e7bf4d32761617574c
+R 1758d4287c38e70ebe46598e4b662121
 U drh
-Z aaf8a72afb67fb32144fc0364d09d870
+Z d0910071efb9b72075e77f5cb05b8223
diff --git a/manifest.uuid b/manifest.uuid
index b3a551e5d8..9cc2345c09 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fe7517bf4d360597576ab9aba29627d7926d23f2bbbfb3e7bf4d32761617574c
\ No newline at end of file
+61b4459ae6a6cc182c11abbc8b1dd629f77beb088d7ccad5e563d8d4769056df
\ No newline at end of file
diff --git a/src/insert.c b/src/insert.c
index 04b91d8405..0a140fd4cd 100644
--- a/src/insert.c
+++ b/src/insert.c
@@ -220,7 +220,7 @@ void sqlite3ComputeStoredColumns(
   for(i=0; i<pTab->nCol; i++, iRegStore++){
     u32 colFlags = pTab->aCol[i].colFlags;
     if( (colFlags & COLFLAG_VIRTUAL)!=0 ){
-      /* Virtual columns are no stored */
+      /* Virtual columns are not stored */
       iRegStore--;
     }else if( (colFlags & COLFLAG_STORED)!=0 ){
       /* Stored columns are handled on the second pass */
@@ -694,7 +694,7 @@ void sqlite3Insert(
   ** is appears in the original table.  (The index of the INTEGER
   ** PRIMARY KEY in the original table is pTab->iPKey.)
   */
-  bIdListInOrder = (pTab->tabFlags & TF_OOOHidden)==0;
+  bIdListInOrder = (pTab->tabFlags & (TF_OOOHidden|TF_HasStored))==0;
   if( pColumn ){
     for(i=0; i<pColumn->nId; i++){
       pColumn->a[i].idx = -1;