From: dan Date: Fri, 20 Apr 2018 15:34:08 +0000 (+0000) Subject: Add test cases for UPSERT. And a fix for a "REPLACE INTO ... ON CONFLICT" X-Git-Tag: version-3.24.0~130 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a46838cb1362893b7436ffce0e27a98899b1639f;p=thirdparty%2Fsqlite.git Add test cases for UPSERT. And a fix for a "REPLACE INTO ... ON CONFLICT" statement where the new row conflicts with both the IPK and the ON CONFLICT indexes. FossilOrigin-Name: d8eb9f8d9b61400c7e12f01ef5c233257b03532221f7c7a8386f7ac2db439626 --- diff --git a/manifest b/manifest index be6ca0eb62..8aa4cda223 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Enhance\sUPSERT\sso\sthat\sthe\sUPDATE\suses\sthe\ssame\sset\sof\scursors\sas\sthe\sINSERT. -D 2018-04-20T13:18:51.643 +C Add\stest\scases\sfor\sUPSERT.\sAnd\sa\sfix\sfor\sa\s"REPLACE\sINTO\s...\sON\sCONFLICT"\nstatement\swhere\sthe\snew\srow\sconflicts\swith\sboth\sthe\sIPK\sand\sthe\sON\sCONFLICT\nindexes. +D 2018-04-20T15:34:08.067 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F Makefile.in 5ce9343cba9c189046f1afe6d2bcc1f68079439febc05267b98aec6ecc752439 @@ -453,7 +453,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 465e927874e602a66d6d20bb9cf73099f25a3c067b87725ed7b4ddb0c3fdb327 +F src/insert.c 33a2c72b6182e8ddf697d604cc087c77ff5fc512a32b8b624641d41b390e249e F src/legacy.c 134ab3e3fae00a0f67a5187981d6935b24b337bcf0f4b3e5c9fa5763da95bf4e F src/loadext.c f6e4e416a736369f9e80eba609f0acda97148a8b0453784d670c78d3eed2f302 F src/main.c 10e3897f5d78cef6bcbd1eedc8ccc3fe9e9783d07e052d9d70e57364ded19274 @@ -1512,7 +1512,7 @@ F test/update2.test 5e67667e1c54017d964e626db765cf8bedcf87483c184f4c575bdb8c1dd2 F test/upsert1.test 934315888a04b4e119ebb6abf558d92bf01d9f94fc8ff0bbc1c7c6015005340f F test/upsert2.test 9c3cdbb1a890227f6504ce4b0e3de68f4cdfa16bb21d8641208a9239896c5a09 F test/upsert3.test 88d7d590a1948a9cb6eac1b54b0642f67a9f35a1fc0f19b200e97d5d39e3179c -F test/upsert4.test 83b37a92f315217c9319f320966c044ddccf8bc525501fa09e2ee47779e3920b +F test/upsert4.test c70b9dd9ae9952d8942ae2558dcecdeb1128097b1d03a22d8ae42660112ffc73 F test/uri.test 3481026f00ade6dfe8adb7acb6e1e47b04369568 F test/uri2.test 9d3ba7a53ee167572d53a298ee4a5d38ec4a8fb7 F test/userauth01.test e740a2697a7b40d7c5003a7d7edaee16acd349a9 @@ -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 fdf71be65835e7e8915d16dd64114de35c4754ef5b94a2af6cac88a94817fb75 -R 326ed33577c38b92a582a5286c34af37 -U drh -Z c39fcdbaadf5ac0f8b6a71ef409492a9 +P c37f39d18d41ae5ba6c4561d87cbbf71f3b6896b86cc5cff9cdf046b02dc521a +R ae514c5e5a987302d42c4363153aaf33 +U dan +Z a0358cccdac92456839b19732d4467cc diff --git a/manifest.uuid b/manifest.uuid index 28cae4e580..67904869cc 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -c37f39d18d41ae5ba6c4561d87cbbf71f3b6896b86cc5cff9cdf046b02dc521a \ No newline at end of file +d8eb9f8d9b61400c7e12f01ef5c233257b03532221f7c7a8386f7ac2db439626 \ No newline at end of file diff --git a/src/insert.c b/src/insert.c index 782244a135..d2ac028d91 100644 --- a/src/insert.c +++ b/src/insert.c @@ -1496,7 +1496,7 @@ void sqlite3GenerateConstraintChecks( assert( OE_Abort=OE_Replace - && onError!=overrideError + && (pUpsert || onError!=overrideError) && pTab->pIndex ){ sAddr.ipkTop = sqlite3VdbeAddOp0(v, OP_Goto)+1; diff --git a/test/upsert4.test b/test/upsert4.test index afc2aacf8d..06fd85b040 100644 --- a/test/upsert4.test +++ b/test/upsert4.test @@ -116,6 +116,7 @@ foreach {tn sql} { 6 "ON CONFLICT (b, c, d) WHERE a!=0 DO NOTHING" 0 7 "ON CONFLICT (d, c, c) WHERE a!=0 DO NOTHING" 2 8 "ON CONFLICT (b COLLATE nocase, c COLLATE nocase, d) DO NOTHING" 2 + 9 "ON CONFLICT (b, c, d) WHERE b==45 DO NOTHING" 0 } { do_catchsql_test 2.$tn.2.$tn2 " @@ -144,7 +145,7 @@ foreach {tn sql} { } { reset_db execsql $sql - do_execsql_test 2.$tn.1 { + do_execsql_test 3.$tn.1 { INSERT INTO abc VALUES(1, 'one', 'two'); } @@ -156,22 +157,76 @@ foreach {tn sql} { 5 "ON CONFLICT (x || 'x') DO NOTHING" 2 6 "ON CONFLICT ((('x' || x))) DO NOTHING" 0 } { - do_catchsql_test 2.$tn.2.$tn2 " + do_catchsql_test 3.$tn.2.$tn2 " INSERT INTO abc VALUES(2, 'one', NULL) $oc; " $rtbl($res) } - do_execsql_test 2.$tn.3 { + do_execsql_test 3.$tn.3 { SELECT * FROM abc } {1 one two} } -do_catchsql_test 3.0 { +foreach {tn sql} { + 1 { + CREATE TABLE abc(a INTEGER PRIMARY KEY, x, y); + CREATE UNIQUE INDEX abc1 ON abc(x) WHERE y>0; + CREATE UNIQUE INDEX abc2 ON abc(y) WHERE x='xyz' COLLATE nocase; + } +} { + reset_db + execsql $sql + do_execsql_test 4.$tn.1 { + INSERT INTO abc VALUES(1, 'one', 1); + INSERT INTO abc VALUES(2, 'two', 2); + INSERT INTO abc VALUES(3, 'xyz', 3); + INSERT INTO abc VALUES(4, 'XYZ', 4); + } + + foreach {tn2 oc res} { + 1 "ON CONFLICT DO NOTHING" 0 + 2 "ON CONFLICT(x) WHERE y>0 DO NOTHING" 0 + 3 "ON CONFLICT(x) DO NOTHING" 2 + 4 "ON CONFLICT(x) WHERE y>=0 DO NOTHING" 2 + 5 "ON CONFLICT(y) WHERE x='xyz' COLLATE nocase DO NOTHING" 1 + } { + do_catchsql_test 4.$tn.2.$tn2 " + INSERT INTO abc VALUES(5, 'one', 10) $oc + " $rtbl($res) + } + + do_execsql_test 4.$tn.3 { + SELECT * FROM abc + } {1 one 1 2 two 2 3 xyz 3 4 XYZ 4} + + foreach {tn2 oc res} { + 1 "ON CONFLICT DO NOTHING" 0 + 2 "ON CONFLICT(y) WHERE x='xyz' COLLATE nocase DO NOTHING" 0 + 3 "ON CONFLICT(y) WHERE x='xyz' COLLATE binary DO NOTHING" 2 + 4 "ON CONFLICT(x) WHERE y>0 DO NOTHING" 1 + } { + do_catchsql_test 4.$tn.2.$tn2 " + INSERT INTO abc VALUES(5, 'xYz', 3) $oc + " $rtbl($res) + } +} + +do_catchsql_test 5.0 { CREATE TABLE w1(a INT PRIMARY KEY, x, y); CREATE UNIQUE INDEX w1expr ON w1(('x' || x)); INSERT INTO w1 VALUES(2, 'one', NULL) ON CONFLICT (('x' || x) COLLATE nocase) DO NOTHING; } {1 {ON CONFLICT clause does not match any PRIMARY KEY or UNIQUE constraint}} +#------------------------------------------------------------------------- +# +do_execsql_test 6.0 { + CREATE TABLE t1(a INTEGER PRIMARY KEY, b UNIQUE, c); + INSERT INTO t1 VALUES(1, 1, 'one'); + INSERT INTO t1 VALUES(2, 2, 'two'); + INSERT OR REPLACE INTO t1 VALUES(1, 2, 'two') ON CONFLICT(b) DO NOTHING; + PRAGMA integrity_check; +} {ok} + finish_test