Improved VDBE comment on UPSERT code.

FossilOrigin-Name: 131ed95e1452a5b0d92341c48a5d3915b328ccfce2cf605f702428ae7ee3e21b

diff --git a/manifest b/manifest
index 10143260fd68b2be1b9a45b0ab97899a9514e31b..c98c1abd7004ab3be4a02967ddac838d5def5120 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\ssimplification\sof\sthe\sprevious\scheckin.
-D 2018-04-20T16:27:57.105
+C Improved\sVDBE\scomment\son\sUPSERT\scode.
+D 2018-04-20T16:49:51.077
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 5ce9343cba9c189046f1afe6d2bcc1f68079439febc05267b98aec6ecc752439
@@ -558,7 +558,7 @@ F src/tokenize.c 5b0c661a85f783d35b9883830736eeb63be4aefc4f6b7d9cd081d48782c041e
 F src/treeview.c 14d5d1254702ec96876aa52642cb31548612384134970409fae333b25b39d6bb
 F src/trigger.c 4ace6d1d5ba9a89822deb287317f33c810440526eafe185c2d8a48c31df1e995
 F src/update.c ae56e307cf9009290845b79a5f930b7c71613dc9d3ff1d290cdc91c4bd0487d9
-F src/upsert.c 4f1d04b8cbae727c066cb2203dcefb6c4a4e3c54ba6345e5ec0b515e48381299
+F src/upsert.c 23b386d71adea0350ad829244fb3f9580eb0b95f119b3d6d56e7362e883605e4
 F src/utf.c 810fbfebe12359f10bc2a011520a6e10879ab2a163bcb26c74768eab82ea62a5
 F src/util.c d9eb0a6c4aae1b00a7369eadd7ca0bbe946cb4c953b6751aa20d357c2f482157
 F src/vacuum.c 762ee9bbf8733d87d8cd06f58d950e881982e416f8c767334a40ffd341b6bff5
@@ -1724,7 +1724,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 7c4b6d5475092a3e205f01a6972366e27a404568e8e7ba327f2feefac2ce2c7c
-R ba9fca97057e7381fd94c7852f29e2a1
+P d1906689abdb685f78aa97bca4bf301204d12846016d27bc86dcc9ce2b024d24
+R 18734526551b7a3f2bbebfc4bb6f5573
 U drh
-Z 4f1c2dd14e09fbddc1a4bf8066b62778
+Z 95143f322f298a42bef8b7fc14836f21

diff --git a/manifest.uuid b/manifest.uuid
index fa79342f6118e1d7b693082bfe10ef4590ce35b9..e5eb6bed9a161f8004d042e50854fc529ba80787 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d1906689abdb685f78aa97bca4bf301204d12846016d27bc86dcc9ce2b024d24
\ No newline at end of file
+131ed95e1452a5b0d92341c48a5d3915b328ccfce2cf605f702428ae7ee3e21b
\ No newline at end of file

diff --git a/src/upsert.c b/src/upsert.c
index 568dffb53db9812d56e1fd0635aa4033efa2f060..e0e28536a4353bd2a4da6bcda7cc03d062c29e20 100644 (file)
--- a/src/upsert.c
+++ b/src/upsert.c
@@ -226,6 +226,7 @@ void sqlite3UpsertDoUpdate(
         assert( pPk->aiColumn[i]>=0 );
         k = sqlite3ColumnOfIndex(pIdx, pPk->aiColumn[i]);
         sqlite3VdbeAddOp3(v, OP_Column, iCur, k, iPk+i);
+        VdbeComment((v, "%s.%s", pIdx->zName, pTab->aCol[i].zName));
       }
       i = sqlite3VdbeAddOp4Int(v, OP_Found, iDataCur, 0, iPk, nPk);
       VdbeCoverage(v);