diff options
author | drh <drh@noemail.net> | 2018-04-13 13:06:45 +0000 |
---|---|---|
committer | drh <drh@noemail.net> | 2018-04-13 13:06:45 +0000 |
commit | e9c2e772f16899a9eadf117faaf2f0674edec3da (patch) | |
tree | a77981063348b2a87095c67471cf82026295627a /src/insert.c | |
parent | 788d55aa772b9012f93283b4f3cd89aa9dbfe77d (diff) | |
download | sqlite-e9c2e772f16899a9eadf117faaf2f0674edec3da.tar.gz sqlite-e9c2e772f16899a9eadf117faaf2f0674edec3da.zip |
Back off of the extended upsert syntax that allows multiple ON CONFLICT
clauses. The syntax now is exactly as in PostgreSQL and MySQL. Add support
for WHERE clauses on the conflict-target phrase, for partial indexes.
FossilOrigin-Name: 2c1b1987d8de1efa8ed7e1f199710e32ff20edf8ceec570514fc63bb1ef264e0
Diffstat (limited to 'src/insert.c')
-rw-r--r-- | src/insert.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/insert.c b/src/insert.c index 313434bad..f399f1417 100644 --- a/src/insert.c +++ b/src/insert.c @@ -805,9 +805,9 @@ void sqlite3Insert( } } #ifndef SQLITE_OMIT_UPSERT - if( pUpsert ){ + if( pUpsert && pUpsert->pUpsertTarget ){ pTabList->a[0].iCursor = iDataCur; - sqlite3UpsertAnalyze(pParse, pTabList, pUpsert); + sqlite3UpsertAnalyzeTarget(pParse, pTabList, pUpsert); } #endif |