From: rdc Date: Fri, 20 Feb 2004 22:54:25 +0000 (+0000) Subject: Fixed behaviour of last_insert_rowid() with triggers and add last_statement_change_co... X-Git-Tag: version-3.6.10~4816 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a503d7312a1bc1926f4d8d3626df3f20dfb92ab4;p=thirdparty%2Fsqlite.git Fixed behaviour of last_insert_rowid() with triggers and add last_statement_change_count() function that works correctly with triggers. (CVS 1252) FossilOrigin-Name: 6734c923395ca41ce453f56dd7d6e7794fbb3bb5 --- diff --git a/manifest b/manifest index bc310c572d..83120e72e8 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fixed\sbehaviour\sof\slast_insert_rowid()\swith\striggers\sand\sadd\slast_statement_change_count()\sfunction\sthat\sworks\scorrectly\swith\striggers.\s(CVS\s1251) -D 2004-02-20T22:53:39 +C Fixed\sbehaviour\sof\slast_insert_rowid()\swith\striggers\sand\sadd\slast_statement_change_count()\sfunction\sthat\sworks\scorrectly\swith\striggers.\s(CVS\s1252) +D 2004-02-20T22:54:25 F Makefile.in cfd75c46b335881999333a9e4b982fa8491f200b F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd @@ -99,6 +99,8 @@ F test/intpkey.test 9320af48415c594afd4e15f8ef0daa272e05502e F test/ioerr.test 5dbaf09f96b56ee01cf3edd762b96eb4ad2c9ca4 F test/join.test 9ef6aabaac9de51d5fc41e68d1f4355da05a84cd F test/join2.test c97e4c5aa65dea462145529e58212a709b4722b8 +F test/lastinsert.test 31382f88b9b0270333ac9e4a17f2c2f4732da718 +F test/laststmtchanges.test cabd11bdfbaf73a4486c50b58297d9c2038ccc18 F test/limit.test fa2a8b3fe377ebe60e0bc9a6a35af9ac4eb3d2b3 F test/lock.test 226ef831dad60ad4d200dc83e25479ba952aac7e F test/main.test 6a851b5992c4881a725a3d9647e629199df8de9d @@ -186,7 +188,7 @@ F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604 F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4 -P 574dd444e7ff00e0fccc3436fe617ad832daae40 -R 2d08fc4d8b9780421fb79aa060691994 +P 3383413a53bff0fef0765144de3bb9a298a5bb5c +R b5d9c0064776a3bb826e845478d6de2a U rdc -Z c0c95fab98bfcf50f66a4b79678cfbb0 +Z 17f3f9f8b48d6e6b9d04672fd56a4cfe diff --git a/manifest.uuid b/manifest.uuid index 4000e7bf2b..b0f638ba5d 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -3383413a53bff0fef0765144de3bb9a298a5bb5c \ No newline at end of file +6734c923395ca41ce453f56dd7d6e7794fbb3bb5 \ No newline at end of file diff --git a/test/lastinsert.test b/test/lastinsert.test new file mode 100644 index 0000000000..702b437e8a --- /dev/null +++ b/test/lastinsert.test @@ -0,0 +1,319 @@ +# 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. +# +#*********************************************************************** +# +# Tests to make sure that value returned by last_insert_rowid() (LIRID) +# is updated properly, especially inside triggers +# +# Note 1: insert into table is now the only statement which changes LIRID +# Note 2: upon entry into before or instead of triggers, +# LIRID is unchanged (rather than -1) +# Note 3: LIRID is changed within the context of a trigger, +# but is restored once the trigger exits +# Note 4: LIRID is not changed by an insert into a view (since everything +# is done within instead of trigger context) +# + +set testdir [file dirname $argv0] +source $testdir/tester.tcl + +# ---------------------------------------------------------------------------- +# 1.x - basic tests (no triggers) + +# LIRID changed properly after an insert into a table +do_test lastinsert-1.1 { + catchsql { + create table t1 (k integer primary key); + insert into t1 values (1); + insert into t1 values (NULL); + insert into t1 values (NULL); + select last_insert_rowid(); + } +} {0 3} + +# LIRID unchanged after an update on a table +do_test lastinsert-1.2 { + catchsql { + update t1 set k=4 where k=2; + select last_insert_rowid(); + } +} {0 3} + +# LIRID unchanged after a delete from a table +do_test lastinsert-1.3 { + catchsql { + delete from t1 where k=4; + select last_insert_rowid(); + } +} {0 3} + +# LIRID unchanged after create table/view statements +do_test lastinsert-1.4 { + catchsql { + create table t2 (k integer primary key, val1, val2, val3); + create view v as select * from t1; + select last_insert_rowid(); + } +} {0 3} + +# ---------------------------------------------------------------------------- +# 2.x - tests with after insert trigger + +# LIRID changed properly after an insert into table containing an after trigger +do_test lastinsert-2.1 { + catchsql { + delete from t2; + create trigger r1 after insert on t1 for each row begin + insert into t2 values (NEW.k*2, last_insert_rowid(), NULL, NULL); + update t2 set k=k+10, val2=100+last_insert_rowid(); + update t2 set val3=1000+last_insert_rowid(); + end; + insert into t1 values (13); + select last_insert_rowid(); + } +} {0 13} + +# LIRID equals NEW.k upon entry into after insert trigger +do_test lastinsert-2.2 { + catchsql { + select val1 from t2; + } +} {0 13} + +# LIRID changed properly by insert within context of after insert trigger +do_test lastinsert-2.3 { + catchsql { + select val2 from t2; + } +} {0 126} + +# LIRID unchanged by update within context of after insert trigger +do_test lastinsert-2.4 { + catchsql { + select val3 from t2; + } +} {0 1026} + +# ---------------------------------------------------------------------------- +# 3.x - tests with after update trigger + +# LIRID not changed after an update onto a table containing an after trigger +do_test lastinsert-3.1 { + catchsql { + delete from t2; + drop trigger r1; + create trigger r1 after update on t1 for each row begin + insert into t2 values (NEW.k*2, last_insert_rowid(), NULL, NULL); + update t2 set k=k+10, val2=100+last_insert_rowid(); + update t2 set val3=1000+last_insert_rowid(); + end; + update t1 set k=14 where k=3; + select last_insert_rowid(); + } +} {0 13} + +# LIRID unchanged upon entry into after update trigger +do_test lastinsert-3.2 { + catchsql { + select val1 from t2; + } +} {0 13} + +# LIRID changed properly by insert within context of after update trigger +do_test lastinsert-3.3 { + catchsql { + select val2 from t2; + } +} {0 128} + +# LIRID unchanged by update within context of after update trigger +do_test lastinsert-3.4 { + catchsql { + select val3 from t2; + } +} {0 1028} + +# ---------------------------------------------------------------------------- +# 4.x - tests with instead of insert trigger + +# LIRID not changed after an insert into view containing an instead of trigger +do_test lastinsert-4.1 { + catchsql { + delete from t2; + drop trigger r1; + create trigger r1 instead of insert on v for each row begin + insert into t2 values (NEW.k*2, last_insert_rowid(), NULL, NULL); + update t2 set k=k+10, val2=100+last_insert_rowid(); + update t2 set val3=1000+last_insert_rowid(); + end; + insert into v values (15); + select last_insert_rowid(); + } +} {0 13} + +# LIRID unchanged upon entry into instead of trigger +do_test lastinsert-4.2 { + catchsql { + select val1 from t2; + } +} {0 13} + +# LIRID changed properly by insert within context of instead of trigger +do_test lastinsert-4.3 { + catchsql { + select val2 from t2; + } +} {0 130} + +# LIRID unchanged by update within context of instead of trigger +do_test lastinsert-4.4 { + catchsql { + select val3 from t2; + } +} {0 1030} + +# ---------------------------------------------------------------------------- +# 5.x - tests with before delete trigger + +# LIRID not changed after a delete on a table containing a before trigger +do_test lastinsert-5.1 { + catchsql { + delete from t2; + drop trigger r1; + create trigger r1 before delete on t1 for each row begin + insert into t2 values (77, last_insert_rowid(), NULL, NULL); + update t2 set k=k+10, val2=100+last_insert_rowid(); + update t2 set val3=1000+last_insert_rowid(); + end; + delete from t1 where k=1; + select last_insert_rowid(); + } +} {0 13} + +# LIRID unchanged upon entry into delete trigger +do_test lastinsert-5.2 { + catchsql { + select val1 from t2; + } +} {0 13} + +# LIRID changed properly by insert within context of delete trigger +do_test lastinsert-5.3 { + catchsql { + select val2 from t2; + } +} {0 177} + +# LIRID unchanged by update within context of delete trigger +do_test lastinsert-5.4 { + catchsql { + select val3 from t2; + } +} {0 1077} + +# ---------------------------------------------------------------------------- +# 6.x - tests with instead of update trigger + +# LIRID not changed after an update on a view containing an instead of trigger +do_test lastinsert-6.1 { + catchsql { + delete from t2; + drop trigger r1; + create trigger r1 instead of update on v for each row begin + insert into t2 values (NEW.k*2, last_insert_rowid(), NULL, NULL); + update t2 set k=k+10, val2=100+last_insert_rowid(); + update t2 set val3=1000+last_insert_rowid(); + end; + update v set k=16 where k=14; + select last_insert_rowid(); + } +} {0 13} + +# LIRID unchanged upon entry into instead of trigger +do_test lastinsert-6.2 { + catchsql { + select val1 from t2; + } +} {0 13} + +# LIRID changed properly by insert within context of instead of trigger +do_test lastinsert-6.3 { + catchsql { + select val2 from t2; + } +} {0 132} + +# LIRID unchanged by update within context of instead of trigger +do_test lastinsert-6.4 { + catchsql { + select val3 from t2; + } +} {0 1032} + +# ---------------------------------------------------------------------------- +# 7.x - complex tests with temporary tables and nested instead of triggers + +do_test lastinsert-7.1 { + catchsql { + drop table t1; drop table t2; drop trigger r1; + create temp table t1 (k integer primary key); + create temp table t2 (k integer primary key); + create temp view v1 as select * from t1; + create temp view v2 as select * from t2; + create temp table rid (k integer primary key, rin, rout); + insert into rid values (1, NULL, NULL); + insert into rid values (2, NULL, NULL); + create temp trigger r1 instead of insert on v1 for each row begin + update rid set rin=last_insert_rowid() where k=1; + insert into t1 values (100+NEW.k); + insert into v2 values (100+last_insert_rowid()); + update rid set rout=last_insert_rowid() where k=1; + end; + create temp trigger r2 instead of insert on v2 for each row begin + update rid set rin=last_insert_rowid() where k=2; + insert into t2 values (1000+NEW.k); + update rid set rout=last_insert_rowid() where k=2; + end; + insert into t1 values (77); + select last_insert_rowid(); + } +} {0 77} + +do_test lastinsert-7.2 { + catchsql { + insert into v1 values (5); + select last_insert_rowid(); + } +} {0 77} + +do_test lastinsert-7.3 { + catchsql { + select rin from rid where k=1; + } +} {0 77} + +do_test lastinsert-7.4 { + catchsql { + select rout from rid where k=1; + } +} {0 105} + +do_test lastinsert-7.5 { + catchsql { + select rin from rid where k=2; + } +} {0 105} + +do_test lastinsert-7.6 { + catchsql { + select rout from rid where k=2; + } +} {0 1205} + +finish_test + diff --git a/test/laststmtchanges.test b/test/laststmtchanges.test new file mode 100644 index 0000000000..b7929847be --- /dev/null +++ b/test/laststmtchanges.test @@ -0,0 +1,244 @@ +# 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. +# +#*********************************************************************** +# +# Tests to make sure that value returned by last_statement_change_count() +# (LSCC) is updated properly, especially inside triggers +# +# Note 1: LSCC remains constant within a statement and only updates once +# the statement is finished (triggers count as part of statement) +# Note 2: LSCC is changed within the context of a trigger +# much like last_insert_rowid() (see lastinsert.test), +# but is restored once the trigger exits +# Note 3: LSCC is not changed by a change to a view (since everything +# is done within instead of trigger context) +# + +set testdir [file dirname $argv0] +source $testdir/tester.tcl + +# ---------------------------------------------------------------------------- +# 1.x - basic tests (no triggers) + +# LSCC set properly after insert +do_test laststmtchanges-1.1 { + catchsql { + create table t0 (x); + insert into t0 values (1); + insert into t0 values (1); + insert into t0 values (2); + insert into t0 values (2); + insert into t0 values (1); + insert into t0 values (1); + insert into t0 values (1); + insert into t0 values (2); + select last_statement_change_count(); + } +} {0 1} + +# LSCC set properly after update +do_test laststmtchanges-1.2 { + catchsql { + update t0 set x=3 where x=1; + select last_statement_change_count(); + } +} {0 5} + +# LSCC unchanged within an update statement +do_test laststmtchanges-1.3 { + catchsql { + update t0 set x=x+last_statement_change_count() where x=3; + select count() from t0 where x=8; + } +} {0 5} + +# LSCC set properly after update on table where no rows changed +do_test laststmtchanges-1.4 { + catchsql { + update t0 set x=77 where x=88; + select last_statement_change_count(); + } +} {0 0} + +# LSCC set properly after delete from table +do_test laststmtchanges-1.5 { + catchsql { + delete from t0 where x=2; + select last_statement_change_count(); + } +} {0 3} + +# ---------------------------------------------------------------------------- +# 2.x - tests with after insert trigger + +# LSCC changed properly after insert into table containing after trigger +do_test laststmtchanges-2.1 { + catchsql { + create table t1 (k integer primary key); + create table t2 (k integer primary key, v1, v2); + create trigger r1 after insert on t1 for each row begin + insert into t2 values (NULL, last_statement_change_count(), NULL); + update t0 set x=x; + update t2 set v2=last_statement_change_count(); + end; + insert into t1 values (77); + select last_statement_change_count(); + } +} {0 1} + +# LSCC unchanged upon entry into after insert trigger +do_test laststmtchanges-2.2 { + catchsql { + select v1 from t2; + } +} {0 3} + +# LSCC changed properly by update within context of after insert trigger +do_test laststmtchanges-2.3 { + catchsql { + select v2 from t2; + } +} {0 5} + +# ---------------------------------------------------------------------------- +# 3.x - tests with after update trigger + +# LSCC changed properly after update into table containing after trigger +do_test laststmtchanges-3.1 { + catchsql { + drop trigger r1; + delete from t2; delete from t2; + create trigger r1 after update on t1 for each row begin + insert into t2 values (NULL, last_statement_change_count(), NULL); + delete from t0 where oid=1 or oid=2; + update t2 set v2=last_statement_change_count(); + end; + update t1 set k=k; + select last_statement_change_count(); + } +} {0 1} + +# LSCC unchanged upon entry into after update trigger +do_test laststmtchanges-3.2 { + catchsql { + select v1 from t2; + } +} {0 0} + +# LSCC changed properly by delete within context of after update trigger +do_test laststmtchanges-3.3 { + catchsql { + select v2 from t2; + } +} {0 2} + +# ---------------------------------------------------------------------------- +# 4.x - tests with before delete trigger + +# LSCC changed properly on delete from table containing before trigger +do_test laststmtchanges-4.1 { + catchsql { + drop trigger r1; + delete from t2; delete from t2; + create trigger r1 before delete on t1 for each row begin + insert into t2 values (NULL, last_statement_change_count(), NULL); + insert into t0 values (5); + update t2 set v2=last_statement_change_count(); + end; + delete from t1; + select last_statement_change_count(); + } +} {0 1} + +# LSCC unchanged upon entry into before delete trigger +do_test laststmtchanges-4.2 { + catchsql { + select v1 from t2; + } +} {0 0} + +# LSCC changed properly by insert within context of before delete trigger +do_test laststmtchanges-4.3 { + catchsql { + select v2 from t2; + } +} {0 1} + +# ---------------------------------------------------------------------------- +# 5.x - complex tests with temporary tables and nested instead of triggers + +do_test laststmtchanges-5.1 { + catchsql { + drop table t0; drop table t1; drop table t2; + create temp table t0(x); + create temp table t1 (k integer primary key); + create temp table t2 (k integer primary key); + create temp view v1 as select * from t1; + create temp view v2 as select * from t2; + create temp table n1 (k integer primary key, n); + create temp table n2 (k integer primary key, n); + insert into t0 values (1); + insert into t0 values (2); + insert into t0 values (1); + insert into t0 values (1); + insert into t0 values (1); + insert into t0 values (2); + insert into t0 values (2); + insert into t0 values (1); + create temp trigger r1 instead of insert on v1 for each row begin + insert into n1 values (NULL, last_statement_change_count()); + update t0 set x=x*10 where x=1; + insert into n1 values (NULL, last_statement_change_count()); + insert into t1 values (NEW.k); + insert into n1 values (NULL, last_statement_change_count()); + update t0 set x=x*10 where x=0; + insert into v2 values (100+NEW.k); + insert into n1 values (NULL, last_statement_change_count()); + end; + create temp trigger r2 instead of insert on v2 for each row begin + insert into n2 values (NULL, last_statement_change_count()); + insert into t2 values (1000+NEW.k); + insert into n2 values (NULL, last_statement_change_count()); + update t0 set x=x*100 where x=0; + insert into n2 values (NULL, last_statement_change_count()); + delete from t0 where x=2; + insert into n2 values (NULL, last_statement_change_count()); + end; + insert into t1 values (77); + select last_statement_change_count(); + } +} {0 1} + +do_test laststmtchanges-5.2 { + catchsql { + delete from t1 where k=88; + select last_statement_change_count(); + } +} {0 0} + +do_test laststmtchanges-5.3 { + catchsql { + insert into v1 values (5); + select last_statement_change_count(); + } +} {0 0} + +do_test laststmtchanges-5.4 { + catchsql { + select n from n1; + } +} {0 {0 5 1 0}} + +do_test laststmtchanges-5.5 { + catchsql { + select n from n2; + } +} {0 {0 1 0 3}} + +finish_test +