From 79b0c95687e1d28444541441d421ea4ebddeecab Mon Sep 17 00:00:00 2001 From: drh Date: Tue, 21 May 2002 12:56:43 +0000 Subject: [PATCH] Fix for ticket #45: Allow an UPDATE statement to change the INTEGER PRIMARY KEY to itself without triggering a constraint error. (CVS 573) FossilOrigin-Name: 592da1346872e1373bd13525d05d0f33c1056709 --- manifest | 14 ++++----- manifest.uuid | 2 +- src/insert.c | 9 +++++- test/update.test | 75 ++++++++++++++++++++++++++++++++++++++++++++---- 4 files changed, 86 insertions(+), 14 deletions(-) diff --git a/manifest b/manifest index 17f8128100..585da1d554 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Additional\scode\scleanup\sresulting\sfrom\sa\sreview\sof\sthe\snew\strigger\scode.\s(CVS\s572) -D 2002-05-21T11:38:11 +C Fix\sfor\sticket\s#45:\sAllow\san\sUPDATE\sstatement\sto\schange\sthe\sINTEGER\sPRIMARY\sKEY\nto\sitself\swithout\striggering\sa\sconstraint\serror.\s(CVS\s573) +D 2002-05-21T12:56:43 F Makefile.in 6291a33b87d2a395aafd7646ee1ed562c6f2c28c F Makefile.template 4e11752e0b5c7a043ca50af4296ec562857ba495 F README a4c0ba11354ef6ba0776b400d057c59da47a4cc0 @@ -27,7 +27,7 @@ F src/expr.c 2c7535ba013b731ed73f12b6cc1cd5b466efb3e2 F src/func.c a31dcba85bc2ecb9b752980289cf7e6cd0cafbce F src/hash.c cc259475e358baaf299b00a2c7370f2b03dda892 F src/hash.h dca065dda89d4575f3176e75e9a3dc0f4b4fb8b9 -F src/insert.c bc98bfe7f508f7a3027ea93ef9bbdc87bbce1e93 +F src/insert.c 5b6586bb5d8306280253829f42f5f98b1455e757 F src/main.c 3f0db74a3e8385322a3b69f51bea6ce19caeff19 F src/md5.c 0ae1f3e2cac92d06fc6246d1b4b8f61a2fe66d3b F src/os.c 5ab8b6b4590d0c1ab8e96c67996c170e4462e0fc @@ -102,7 +102,7 @@ F test/trans.test ae0b9a82d5d34122c3a3108781eb8d078091ccee F test/trigger1.test 06dd47935cf38ce5de0b232e7b61aad57685bae1 F test/trigger2.test 662818d5cc3313c14819df1c9084c119057a0bde F test/unique.test 07776624b82221a80c8b4138ce0dd8b0853bb3ea -F test/update.test 3cf1ca0565f678063c2dfa9a7948d2d66ae1a778 +F test/update.test a0aa0bf83e6fad8407d0e4ad25ebb09b513f5bf4 F test/vacuum.test 059871b312eb910bbe49dafde1d01490cc2c6bbe F test/view.test b9851e9142de5e5831fdf18f125cbe1256cb550a F test/where.test 1d85a7eba93e7acc0a971c6d9daead0e49cb023a @@ -134,7 +134,7 @@ F www/speed.tcl da8afcc1d3ccc5696cfb388a68982bc3d9f7f00f F www/sqlite.tcl 8b5884354cb615049aed83039f8dfe1552a44279 F www/tclsqlite.tcl 1db15abeb446aad0caf0b95b8b9579720e4ea331 F www/vdbe.tcl 2013852c27a02a091d39a766bc87cff329f21218 -P 8a4195c7466962291a296e8f53034ea8cb25005f -R 361b70ca0dd473638df412c87f908919 +P 37dbdd551e88440933066133ec9cc1e10b03fc1a +R dd36d2d9056aabd6c21f44ccd0344249 U drh -Z 5451ccaf091b36f9a5e5679c783b7dab +Z 0984c384f62431e003b1702d17aa1b7d diff --git a/manifest.uuid b/manifest.uuid index 46913b5766..157be6d417 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -37dbdd551e88440933066133ec9cc1e10b03fc1a \ No newline at end of file +592da1346872e1373bd13525d05d0f33c1056709 \ No newline at end of file diff --git a/src/insert.c b/src/insert.c index 091ed75a91..c248aaa92f 100644 --- a/src/insert.c +++ b/src/insert.c @@ -12,7 +12,7 @@ ** This file contains C code routines that are called by the parser ** to handle INSERT statements in SQLite. ** -** $Id: insert.c,v 1.56 2002/05/21 11:38:11 drh Exp $ +** $Id: insert.c,v 1.57 2002/05/21 12:56:43 drh Exp $ */ #include "sqliteInt.h" @@ -565,6 +565,12 @@ void sqliteGenerateConstraintChecks( if( onError==OE_Default ) onError = OE_Abort; } if( onError!=OE_Replace ){ + int jumpInst2; + if( isUpdate ){ + sqliteVdbeAddOp(v, OP_Dup, nCol+1, 1); + sqliteVdbeAddOp(v, OP_Dup, nCol+1, 1); + jumpInst2 = sqliteVdbeAddOp(v, OP_Eq, 0, 0); + } sqliteVdbeAddOp(v, OP_Dup, nCol, 1); jumpInst = sqliteVdbeAddOp(v, OP_NotExists, base, 0); switch( onError ){ @@ -584,6 +590,7 @@ void sqliteGenerateConstraintChecks( contAddr = sqliteVdbeCurrentAddr(v); sqliteVdbeChangeP2(v, jumpInst, contAddr); if( isUpdate ){ + sqliteVdbeChangeP2(v, jumpInst2, contAddr); sqliteVdbeAddOp(v, OP_Dup, nCol+1, 1); sqliteVdbeAddOp(v, OP_MoveTo, base, 0); } diff --git a/test/update.test b/test/update.test index 33a854defd..4867e8a8b9 100644 --- a/test/update.test +++ b/test/update.test @@ -11,7 +11,7 @@ # This file implements regression tests for SQLite library. The # focus of this file is testing the UPDATE statement. # -# $Id: update.test,v 1.8 2001/11/09 22:41:45 drh Exp $ +# $Id: update.test,v 1.9 2002/05/21 12:56:44 drh Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl @@ -410,9 +410,74 @@ do_test update-9.4 { lappend v $msg } {1 {no such function: x}} - - - - +# Try doing updates on a unique column where the value does not +# really change. +# +do_test update-10.1 { + execsql { + DROP TABLE test1; + CREATE TABLE t1( + a integer primary key, + b UNIQUE, + c, d, + e, f, + UNIQUE(c,d) + ); + INSERT INTO t1 VALUES(1,2,3,4,5,6); + INSERT INTO t1 VALUES(2,3,4,4,6,7); + SELECT * FROM t1 + } +} {1 2 3 4 5 6 2 3 4 4 6 7} +do_test update-10.2 { + catchsql { + UPDATE t1 SET a=1, e=9 WHERE f=6; + SELECT * FROM t1; + } +} {0 {1 2 3 4 9 6 2 3 4 4 6 7}} +do_test update-10.3 { + catchsql { + UPDATE t1 SET a=1, e=10 WHERE f=7; + SELECT * FROM t1; + } +} {1 {constraint failed}} +do_test update-10.4 { + catchsql { + SELECT * FROM t1; + } +} {0 {1 2 3 4 9 6 2 3 4 4 6 7}} +do_test update-10.5 { + catchsql { + UPDATE t1 SET b=2, e=11 WHERE f=6; + SELECT * FROM t1; + } +} {0 {1 2 3 4 11 6 2 3 4 4 6 7}} +do_test update-10.6 { + catchsql { + UPDATE t1 SET b=2, e=12 WHERE f=7; + SELECT * FROM t1; + } +} {1 {constraint failed}} +do_test update-10.7 { + catchsql { + SELECT * FROM t1; + } +} {0 {1 2 3 4 11 6 2 3 4 4 6 7}} +do_test update-10.8 { + catchsql { + UPDATE t1 SET c=3, d=4, e=13 WHERE f=6; + SELECT * FROM t1; + } +} {0 {1 2 3 4 13 6 2 3 4 4 6 7}} +do_test update-10.9 { + catchsql { + UPDATE t1 SET c=3, d=4, e=14 WHERE f=7; + SELECT * FROM t1; + } +} {1 {constraint failed}} +do_test update-10.10 { + catchsql { + SELECT * FROM t1; + } +} {0 {1 2 3 4 13 6 2 3 4 4 6 7}} finish_test -- 2.47.3