From: drh Date: Fri, 13 Apr 2018 01:15:09 +0000 (+0000) Subject: Begin adding upsert logic. This is an incremental check-in. X-Git-Tag: version-3.24.0~146^2~23 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=788d55aa772b9012f93283b4f3cd89aa9dbfe77d;p=thirdparty%2Fsqlite.git Begin adding upsert logic. This is an incremental check-in. FossilOrigin-Name: 809696434097e62e8ef486c7478b5eb62c0cf1342522a5584939fade82821410 --- diff --git a/manifest b/manifest index a38311d885..3394ea8e89 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Break\sout\sthe\supsert\scode\sinto\sa\sseparate\ssource\sfile. -D 2018-04-12T21:42:51.995 +C Begin\sadding\supsert\slogic.\s\sThis\sis\san\sincremental\scheck-in. +D 2018-04-13T01:15:09.699 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F Makefile.in 5ce9343cba9c189046f1afe6d2bcc1f68079439febc05267b98aec6ecc752439 @@ -452,7 +452,7 @@ F src/hash.c a12580e143f10301ed5166ea4964ae2853d3905a511d4e0c44497245c7ce1f7a F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4 F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71 -F src/insert.c aca5346dc1cf32c0c7928e85ac6136341565f87ddf9a2fa8066fcf02720d8dc5 +F src/insert.c 5139585f7e3417de3879ef7ab3d5d52c1d0b3c45dd47a34fad5f6f3c9f6ac546 F src/legacy.c 134ab3e3fae00a0f67a5187981d6935b24b337bcf0f4b3e5c9fa5763da95bf4e F src/loadext.c f6e4e416a736369f9e80eba609f0acda97148a8b0453784d670c78d3eed2f302 F src/main.c 1648fc7a9bcfdbfd9a9a04af96ff2796c3164b3f3c7e56ed63a3c51cd11d198d @@ -480,7 +480,7 @@ F src/os_win.c eb03c6d52f893bcd7fdd4c6006674c13c1b5e49543fec98d605201af2997171c F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a F src/pager.c 1bb6a57fa0465296a4d6109a1a64610a0e7adde1f3acf3ef539a9d972908ce8f F src/pager.h c571b064df842ec8f2e90855dead9acf4cbe0d1b2c05afe0ef0d0145f7fd0388 -F src/parse.y e2562b4d985c004d07be27ce4680553ac02f15793bf6389b02178e03e2f10eac +F src/parse.y f6d42ac9ad59137f6fce5962707ce01d83e7807ca8c2f01725ffb6d204c5db27 F src/pcache.c 135ef0bc6fb2e3b7178d49ab5c9176254c8a691832c1bceb1156b2fbdd0869bd F src/pcache.h 072f94d29281cffd99e46c1539849f248c4b56ae7684c1f36626797fee375170 F src/pcache1.c 716975564c15eb6679e97f734cec1bfd6c16ac3d4010f05f1f8e509fc7d19880 @@ -496,7 +496,7 @@ F src/shell.c.in cc960721e56ebc1a78773bb5d2f5608b54275f945cbe49e4afe919d6888062a F src/sqlite.h.in e0be726ea6e4e6571724d39d242472ecd8bd1ba6f84ade88e1641bde98a6d02b F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 83a3c4ce93d650bedfd1aa558cb85a516bd6d094445ee989740827d0d944368d -F src/sqliteInt.h f828216a594f8e1b4e19ebb17e5c6e619b19c00175aca68a5c2af531521cbb0b +F src/sqliteInt.h f99a77238e5f5acb89612f28a62bd08b575ae5a21d03e894d25aeb88204fbd03 F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34 @@ -556,8 +556,8 @@ F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c F src/tokenize.c 5b0c661a85f783d35b9883830736eeb63be4aefc4f6b7d9cd081d48782c041e2 F src/treeview.c 14d5d1254702ec96876aa52642cb31548612384134970409fae333b25b39d6bb F src/trigger.c 00ef0b16ab3f0063439e6582086f57f3beb93cd7e7ba46569a8bdc490c16283d -F src/update.c a72ab172860c73c16fe25a2a3d5ae675fbdd63918cddfa2aaad5f402a86637c9 -F src/upsert.c 8b1a4fc628bbea35b71d8b12878f79a3b3f4ecc6c0566f5bfc44c563ae43626a +F src/update.c f5210fb55d26e20d14d0106c9479a83c63a005b70b1b5291481c48d6dac6fb9f +F src/upsert.c c48c365ea290d6dedcb3b2a1947ef497ec55655360dc6bde81e8e8743f99d136 F src/utf.c 810fbfebe12359f10bc2a011520a6e10879ab2a163bcb26c74768eab82ea62a5 F src/util.c d9eb0a6c4aae1b00a7369eadd7ca0bbe946cb4c953b6751aa20d357c2f482157 F src/vacuum.c 762ee9bbf8733d87d8cd06f58d950e881982e416f8c767334a40ffd341b6bff5 @@ -1507,6 +1507,7 @@ F test/unixexcl.test d936ba2b06794018e136418addd59a2354eeae97 F test/unordered.test ca7adce0419e4ca0c50f039885e76ed2c531eda8 F test/update.test 6c68446b8a0a33d522a7c72b320934596a2d7d32 F test/update2.test 5e67667e1c54017d964e626db765cf8bedcf87483c184f4c575bdb8c1dd2313e +F test/upsert1.test 6ebecb01d19f362c7681d2b62fe416295cd45ec4e008da375fdb0c83c0fc2100 F test/uri.test 3481026f00ade6dfe8adb7acb6e1e47b04369568 F test/uri2.test 9d3ba7a53ee167572d53a298ee4a5d38ec4a8fb7 F test/userauth01.test e740a2697a7b40d7c5003a7d7edaee16acd349a9 @@ -1718,7 +1719,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 046bb6d25865041477f046f24c39a4791224f5b622ff70eda909d8ee3c097511 -R 41785e0192d6fba81c3e6856455c92b9 +P 389806b05f163687d8eb858b0f87f9a2d02e90af9f2097924a66715f05177613 +R 0067d0b1eaa6c506ebf92845ad4647e6 U drh -Z 05e0d66364795932149da9418a180159 +Z 30a3b357b150a25e247bd4c2ee580df9 diff --git a/manifest.uuid b/manifest.uuid index 8cb4711e82..ae4a55a0ab 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -389806b05f163687d8eb858b0f87f9a2d02e90af9f2097924a66715f05177613 \ No newline at end of file +809696434097e62e8ef486c7478b5eb62c0cf1342522a5584939fade82821410 \ No newline at end of file diff --git a/src/insert.c b/src/insert.c index 4fc79c2233..313434bad0 100644 --- a/src/insert.c +++ b/src/insert.c @@ -804,6 +804,13 @@ void sqlite3Insert( pParse->nMem += pIdx->nColumn; } } +#ifndef SQLITE_OMIT_UPSERT + if( pUpsert ){ + pTabList->a[0].iCursor = iDataCur; + sqlite3UpsertAnalyze(pParse, pTabList, pUpsert); + } +#endif + /* This is the top of the main insertion loop */ if( useTempTable ){ @@ -1006,7 +1013,7 @@ void sqlite3Insert( int isReplace; /* Set to true if constraints may cause a replace */ int bUseSeek; /* True to use OPFLAG_SEEKRESULT */ sqlite3GenerateConstraintChecks(pParse, pTab, aRegIdx, iDataCur, iIdxCur, - regIns, 0, ipkColumn>=0, onError, endOfLoop, &isReplace, 0 + regIns, 0, ipkColumn>=0, onError, endOfLoop, &isReplace, 0, pUpsert ); sqlite3FkCheck(pParse, pTab, 0, regIns, 0, 0); @@ -1242,7 +1249,8 @@ void sqlite3GenerateConstraintChecks( u8 overrideError, /* Override onError to this if not OE_Default */ int ignoreDest, /* Jump to this label on an OE_Ignore resolution */ int *pbMayReplace, /* OUT: Set to true if constraint may cause a replace */ - int *aiChng /* column i is unchanged if aiChng[i]<0 */ + int *aiChng, /* column i is unchanged if aiChng[i]<0 */ + Upsert *pUpsert /* ON CONFLICT clauses, if any. NULL otherwise */ ){ Vdbe *v; /* VDBE under constrution */ Index *pIdx; /* Pointer to one of the indices */ diff --git a/src/parse.y b/src/parse.y index 76643619e9..e4a0bc5df7 100644 --- a/src/parse.y +++ b/src/parse.y @@ -873,7 +873,7 @@ upsert(A) ::= . { A = 0; } upsert(A) ::= upsert(X) ON CONFLICT LP sortlist(Y) RP DO UPDATE SET setlist(Z) where_opt(W). { A = sqlite3UpsertNew(pParse->db,X,Y,Z,W); /*X-overwrites-A*/ } -upsert(A) ::= upsert(X) ON DUPLIATE KEY UPDATE setlist(Z) where_opt(W). +upsert(A) ::= upsert(X) ON DUPLICATE KEY UPDATE setlist(Z) where_opt(W). { A = sqlite3UpsertNew(pParse->db,X,0,Z,W); /*X-overwrites-A*/ } upsert(A) ::= upsert(X) ON CONFLICT LP sortlist(Y) RP DO NOTHING. { A = sqlite3UpsertNew(pParse->db,X,Y,0,0); /*X-overwrites-A*/ } diff --git a/src/sqliteInt.h b/src/sqliteInt.h index bb23e25b43..b1e412fcba 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -2713,11 +2713,27 @@ struct NameContext { ** An instance of the following object describes a single ON CONFLICT ** clause in an upsert. A list of these objects may be attached to ** an INSERT statement in order to form an upsert. +** +** The pUpsertTarget field is only set if the ON CONFLICT clause includes +** conflict-target clause. (In "ON CONFLICT(a,b)" the "(a,b)" is the +** conflict-target clause.) +** +** pUpsertSet is the list of column=expr terms of the UPDATE statement. +** The pUpsertSet field is NULL for a ON CONFLICT DO NOTHING. The +** pUpsertWhere is the WHERE clause for the UPDATE and is NULL if the +** WHERE clause is omitted. +** +** The pUpsertIdx is a transient pointer to the unique index described +** by pUpsertTarget. If pUpsertTarget describes the rowid, then pUpsertIdx +** will be NULL. pUpsertIdx does not own the Index object it points to. +** Care must be taken to ensure that the Index object does not expire while +** the pointer is valid. */ struct Upsert { ExprList *pUpsertTarget; /* Optional description of conflicting index */ ExprList *pUpsertSet; /* The SET clause from an ON CONFLICT UPDATE */ Expr *pUpsertWhere; /* WHERE clause for the ON CONFLICT UPDATE */ + Index *pUpsertIdx; /* UNIQUE index referenced by pUpsertTarget */ Upsert *pUpsertNext; /* Next ON CONFLICT clause in the list */ }; @@ -3877,7 +3893,7 @@ void sqlite3GenerateRowIndexDelete(Parse*, Table*, int, int, int*, int); int sqlite3GenerateIndexKey(Parse*, Index*, int, int, int, int*,Index*,int); void sqlite3ResolvePartIdxLabel(Parse*,int); void sqlite3GenerateConstraintChecks(Parse*,Table*,int*,int,int,int,int, - u8,u8,int,int*,int*); + u8,u8,int,int*,int*,Upsert*); #ifdef SQLITE_ENABLE_NULL_TRIM void sqlite3SetMakeRecordP5(Vdbe*,Table*); #else @@ -4274,6 +4290,7 @@ const char *sqlite3JournalModename(int); Upsert *sqlite3UpsertNew(sqlite3*,Upsert*,ExprList*,ExprList*,Expr*); void sqlite3UpsertDelete(sqlite3*,Upsert*); Upsert *sqlite3UpsertDup(sqlite3*,Upsert*); + int sqlite3UpsertAnalyze(Parse*,SrcList*,Upsert*); #else #define sqlite3UpsertNew(x,y,z,w) ((Upsert*)0) #define sqlite3UpsertDelete(x,y) diff --git a/src/update.c b/src/update.c index a65f2a8e4b..6b3d5f4945 100644 --- a/src/update.c +++ b/src/update.c @@ -626,7 +626,7 @@ void sqlite3Update( assert( regOldRowid>0 ); sqlite3GenerateConstraintChecks(pParse, pTab, aRegIdx, iDataCur, iIdxCur, regNewRowid, regOldRowid, chngKey, onError, labelContinue, &bReplace, - aXRef); + aXRef, 0); /* Do FK constraint checks. */ if( hasFK ){ diff --git a/src/upsert.c b/src/upsert.c index b42ef06a14..d326a7c6f1 100644 --- a/src/upsert.c +++ b/src/upsert.c @@ -69,4 +69,62 @@ Upsert *sqlite3UpsertNew( return pNew; } +/* +** Analyze the ON CONFLICT clause(s) described by pUpsert. Resolve all +** symbols in the conflict-target clausees. Fill in the pUpsertIdx pointers. +** +** Return non-zero if there are errors. +*/ +int sqlite3UpsertAnalyze( + Parse *pParse, /* The parsing context */ + SrcList *pTabList, /* Table into which we are inserting */ + Upsert *pUpsert /* The list of ON CONFLICT clauses */ +){ + NameContext sNC; + Upsert *p; + Table *pTab; + Index *pIdx; + int rc = SQLITE_OK; + int nDoNothing = 0; + + assert( pTabList->nSrc==1 ); + assert( pTabList->a[0].pTab!=0 ); + memset(&sNC, 0, sizeof(sNC)); + sNC.pParse = pParse; + sNC.pSrcList = pTabList; + pTab = pTabList->a[0].pTab; + for(p=pUpsert; p; p=p->pUpsertNext){ + if( p->pUpsertTarget==0 ){ + if( p->pUpsertSet ){ + /* This is a MySQL-style ON DUPLICATE KEY clause. The ON DUPLICATE + ** KEY clause can only be used if there is exactly one uniqueness + ** constraint and/or PRIMARY KEY */ + int nUnique = 0; + for(pIdx = pTab->pIndex; pIdx; pIdx=pIdx->pNext){ + if( IsUniqueIndex(pIdx) ){ + p->pUpsertIdx = pIdx; + nUnique++; + } + } + if( pTab->iPKey>=0 ) nUnique++; + if( nUnique!=0 ){ + sqlite3ErrorMsg(pParse, "ON DUPLICATE KEY may only be used if there " + "is exactly one UNIQUE or PRIMARY KEY constraint"); + return SQLITE_ERROR; + } + }else{ + nDoNothing++; + if( nDoNothing>1 ){ + sqlite3ErrorMsg(pParse, "multiple unconstrained DO NOTHING clauses"); + return SQLITE_ERROR; + } + } + continue; + } + rc = sqlite3ResolveExprListNames(&sNC, p->pUpsertTarget); + if( rc ) return rc; + } + return rc; +} + #endif /* SQLITE_OMIT_UPSERT */ diff --git a/test/upsert1.test b/test/upsert1.test new file mode 100644 index 0000000000..c522cc082d --- /dev/null +++ b/test/upsert1.test @@ -0,0 +1,46 @@ +# 2018-04-12 +# +# The author disclaims copyright to this source code. In place of +# a legal notice, here is a blessing: +# +# May you do good and not evil. +# May you find forgiveness for yourself and forgive others. +# May you share freely, never taking more than you give. +# +#*********************************************************************** +# +# Test cases for UPSERT + +set testdir [file dirname $argv0] +source $testdir/tester.tcl +set testprefix zipfile + +do_execsql_test upsert1-100 { + CREATE TABLE t1(a INTEGER PRIMARY KEY, b UNIQUE); + INSERT INTO t1(a,b) VALUES(1,2) ON CONFLICT DO NOTHING; + SELECT * FROM t1; +} {1 2} +do_execsql_test upsert1-101 { + DELETE FROM t1; + INSERT INTO t1(a,b) VALUES(2,3) ON CONFLICT(a) DO NOTHING; + SELECT * FROM t1; +} {2 3} +do_execsql_test upsert1-102 { + DELETE FROM t1; + INSERT INTO t1(a,b) VALUES(3,4) + ON CONFLICT(a) DO NOTHING + ON CONFLICT(b) DO NOTHING; + SELECT * FROM t1; +} {3 4} +do_catchsql_test upsert1-110 { + DELETE FROM t1; + INSERT INTO t1(a,b) VALUES(3,4) + ON CONFLICT DO NOTHING + ON CONFLICT DO NOTHING; +} {1 {multiple unconstrained DO NOTHING clauses}} +do_catchsql_test upsert1-120 { + INSERT INTO t1(a,b) VALUES(3,4) + ON DUPLICATE KEY UPDATE a=99; +} {1 {ON DUPLICATE KEY may only be used if there is exactly one UNIQUE or PRIMARY KEY constraint}} + +finish_test