database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-11 01:42:22 +03:00
Code Activity

Initialize all terms in the ON CONFLICT clause stack.

Browse Source 
FossilOrigin-Name: 5e683fd1cbde53f37cf8a2b1e981191e2b29e3376db554691767f33c37c7547e
This commit is contained in:
drh
2020-12-09 01:34:48 +00:00
parent 2549e4cc2f
commit 20b86324a1
3 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
manifest
View File

@@ -1,5 +1,5 @@
C Enhance\sUPSERT\sparsing\sto\sallow\smultiple\sON\sCONFLICT\sclauses.\s\sOnly\sthe\nvery\slast\sclause\smay\somit\sthe\sconflict\starget,\sbut\sthe\sconflict\starget\smay\nnow\sbe\somitted\sfor\sthe\sDO\sUPDATE\sresolution. C Initialize\sall\sterms\sin\sthe\sON\sCONFLICT\sclause\sstack.
D 2020-12-08T14:29:03.533 D 2020-12-09T01:34:48.233
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -501,7 +501,7 @@ F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19
F src/hash.h 9d56a9079d523b648774c1784b74b89bd93fac7b365210157482e4319a468f38 F src/hash.h 9d56a9079d523b648774c1784b74b89bd93fac7b365210157482e4319a468f38
F src/hwtime.h cb1d7e3e1ed94b7aa6fde95ae2c2daccc3df826be26fc9ed7fd90d1750ae6144 F src/hwtime.h cb1d7e3e1ed94b7aa6fde95ae2c2daccc3df826be26fc9ed7fd90d1750ae6144
F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
F src/insert.c 7e081d33aab4a9d761c39dccf3c3872c35501565d2ed9db66301918d23bc7901 F src/insert.c 2fdfd14bf872501f041cb2220632dace2df63342151b9b30ebfb798df3f14632
F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
F src/loadext.c 8c9c8cd2bd8eecdb06d9b6e89de7e9e65bae45cc8fc33609cc74023a5c296067 F src/loadext.c 8c9c8cd2bd8eecdb06d9b6e89de7e9e65bae45cc8fc33609cc74023a5c296067
F src/main.c 97e9f137354bc1f76dc9bb60a0a24f8c45cf73b33e80d3ee4c64155336fb820d F src/main.c 97e9f137354bc1f76dc9bb60a0a24f8c45cf73b33e80d3ee4c64155336fb820d
@@ -1888,10 +1888,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P 4b286129138d44e6f8e9b3450289941e01d20fdfb9d0b5d846031425e8ca6b49 P 2ca62f4c71df6544cb8039bdc80e3701d09697c38800534371f6d44532fcffae
R 204aa888c3a8b96c5008bc9a579603f7 R 522b57bc98ce1a3ca7ad7f44cd4944b4
T *branch * generalized-upsert
T *sym-generalized-upsert *
T -sym-trunk *
U drh U drh
Z d13edca14ac31a65fc7ae7d7fdc7eaff Z 6380cbc8ce17e23f96dde835eaec54ed

2
manifest.uuid
View File

@@ -1 +1 @@
2ca62f4c71df6544cb8039bdc80e3701d09697c38800534371f6d44532fcffae 5e683fd1cbde53f37cf8a2b1e981191e2b29e3376db554691767f33c37c7547e

17
src/insert.c
View File

@@ -975,6 +975,7 @@ void sqlite3Insert(
} }
#ifndef SQLITE_OMIT_UPSERT #ifndef SQLITE_OMIT_UPSERT
if( pUpsert ){ if( pUpsert ){
Upsert *pNx;
if( IsVirtual(pTab) ){ if( IsVirtual(pTab) ){
sqlite3ErrorMsg(pParse, "UPSERT not implemented for virtual table \"%s\"", sqlite3ErrorMsg(pParse, "UPSERT not implemented for virtual table \"%s\"",
pTab->zName); pTab->zName);
@@ -988,13 +989,17 @@ void sqlite3Insert(
goto insert_cleanup; goto insert_cleanup;
} }
pTabList->a[0].iCursor = iDataCur; pTabList->a[0].iCursor = iDataCur;
pUpsert->pUpsertSrc = pTabList; pNx = pUpsert;
pUpsert->regData = regData; do{
pUpsert->iDataCur = iDataCur; pNx->pUpsertSrc = pTabList;
pUpsert->iIdxCur = iIdxCur; pNx->regData = regData;
if( pUpsert->pUpsertTarget ){ pNx->iDataCur = iDataCur;
sqlite3UpsertAnalyzeTarget(pParse, pTabList, pUpsert); pNx->iIdxCur = iIdxCur;
if( pNx->pUpsertTarget ){
sqlite3UpsertAnalyzeTarget(pParse, pTabList, pNx);
} }
pNx = pNx->pNextUpsert;
}while( pNx!=0 );
} }
#endif #endif