Enhance UPSERT so that it allows multiple ON CONFLICT clauses and does

not require a conflict target for DO UPDATE.

FossilOrigin-Name: 6b01a24daab1e5bcb0768ebf994368d941b1dfc217bf6b661211d900331e68cf

diff --cc manifest
index cb0f550f9e12d874e7b54dfead9a32de067fa160,d18f0d5c73c59a84b62ea3b7759eb95ba33accfb..00e5a96cefb998407571077f2b499ccfa7cda8af
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\san\sinteger\soverflow\sproblem\sin\snew\sVACUUM\scode.
- D 2020-12-14T15:25:14.417
 -C Minor\schanges\sfor\stest\scoverage.
 -D 2020-12-14T13:52:03.476
++C Enhance\sUPSERT\sso\sthat\sit\sallows\smultiple\sON\sCONFLICT\sclauses\sand\sdoes\nnot\srequire\sa\sconflict\starget\sfor\sDO\sUPDATE.
++D 2020-12-14T15:39:12.267
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -501,7 -501,7 +501,7 @@@ F src/hash.c 8d7dda241d0ebdafb6ffdeda31
  F src/hash.h 9d56a9079d523b648774c1784b74b89bd93fac7b365210157482e4319a468f38
  F src/hwtime.h cb1d7e3e1ed94b7aa6fde95ae2c2daccc3df826be26fc9ed7fd90d1750ae6144
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
- F src/insert.c 153c5b438d44ba0b8ae7ca467f8f6390b18958d14e681a26e5e861a2ac480750
 -F src/insert.c ec68f3a8b9af7c6e127735af8f61633bc0a2c9cd24a961fb21331ac95c7df251
++F src/insert.c 7300982986b0aae32382ce57438998b92efa64e9a7169378e83c1c5d0e2ecdb3
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
  F src/loadext.c 8c9c8cd2bd8eecdb06d9b6e89de7e9e65bae45cc8fc33609cc74023a5c296067
  F src/main.c 97e9f137354bc1f76dc9bb60a0a24f8c45cf73b33e80d3ee4c64155336fb820d
@@@ -545,7 -545,7 +545,7 @@@ F src/shell.c.in e9f674ee4ec6c345679e8a
  F src/sqlite.h.in 0e2b4259e49a0eda54d9118eb18a04fcd60e0727a2fd2c81aade0bf57520e706
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 61b38c073d5e1e96a3d45271b257aef27d0d13da2bea5347692ae579475cd95e
- F src/sqliteInt.h 6f99431f5b6f90948fb991907c35d11ca4e7eed43da48e790f8facd92c820711
 -F src/sqliteInt.h 31492bf5f9d7ccc4835d5e0a88758737812b0ee4c35c0b961840373dbd18bbb0
++F src/sqliteInt.h ef8b4b3992d9460c9676c4695416f4141d5c5db4d3d78f89d20662361d6e21f1
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
  F src/status.c 4b8bc2a6905163a38b739854a35b826c737333fab5b1f8e03fa7eb9a4799c4c1
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@@ -1889,7 -1889,7 +1890,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P dd058da85ca54ae70e26cb0bdc75ff42998d4a8b29a5e2dcac44ee0e45776a85
- R 0d937f0ec9f044837ba6918ca3838d82
- U dan
- Z 57f4f0625729074fba29cd7d21629db2
 -P f34dd67e2d0dfc9e3b5d49148fb0162853119c097cbc3fe961878875ba98d8e3
 -R e4ba77cafc1a5ebe11440b61ff8c6ede
++P 59b4367fd852ba1bfefdff99a27b11657495a3f114ed6f85fdcf6c532f4a19fa e5a8fa50f4e5e5c24664452eda4af80904f75e5123b8f84353347dbd505d416d
++R 5965c0546552f5972781a0c11e3dea88
++T +closed e5a8fa50f4e5e5c24664452eda4af80904f75e5123b8f84353347dbd505d416d
+ U drh
 -Z 22668862baa080d495b808bc49582152
++Z 3b5c01b64f44977242fcbbbded19a49d

diff --cc manifest.uuid
index c8f28578dbdf1dd01368c2c145b1e8861a7008b8,22965be8e214c0aa5ae79625908b329e29081422..8c7df83e8d8a13b925d6bd8d454ef6c8d97bb166
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 59b4367fd852ba1bfefdff99a27b11657495a3f114ed6f85fdcf6c532f4a19fa
 -e5a8fa50f4e5e5c24664452eda4af80904f75e5123b8f84353347dbd505d416d
++6b01a24daab1e5bcb0768ebf994368d941b1dfc217bf6b661211d900331e68cf

diff --cc src/insert.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge