diff --git a/manifest b/manifest index ba6ccc075b..5fb4794940 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fixed\sstack\sgrowth\sin\supdate\strigger\son\sviews\s(tkt\s#1169)\s(CVS\s2443) -D 2005-04-08T16:08:36 +C Added\stests\sto\sexercise\sdelete,\sinsert,\sand\supdate\striggers\son\sviews\s(tkt\s#1169)\s(CVS\s2444) +D 2005-04-08T19:48:28 F Makefile.in 5c00d0037104de2a50ac7647a5f12769795957a3 F Makefile.linux-gcc 06be33b2a9ad4f005a5f42b22c4a19dab3cbb5c7 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 @@ -203,7 +203,7 @@ F test/trans.test 10506dc30305cfb8c4098359f7f6f64786f69c5e F test/trigger1.test 4c68031fbf62966311163586bdb504b168643b49 F test/trigger2.test f671b922c88f70c3cd2c6f03fe7c256ae7a52fc4 F test/trigger3.test 9102fd3933db294dc654b5aee9edfe9e94f2b9e2 -F test/trigger4.test e7c0812b14750754602468f15495260e8c6625e0 +F test/trigger4.test 9615207f3746b1f3965113007869e45a895d2497 F test/trigger5.test 619391a3e9fc194081d22cefd830d811e7badf83 F test/trigger6.test 88b4c0c9f67e4244af39627538526bbaf97132f5 F test/types.test f0a98d10c5ecc9865d19dc94486f9873afc6bb6b @@ -278,7 +278,7 @@ F www/tclsqlite.tcl 425be741b8ae664f55cb1ef2371aab0a75109cf9 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b F www/whentouse.tcl 528299b8316726dbcc5548e9aa0648c8b1bd055b -P 1a757ba13292577d01bd7b66811bcfd6748b9f7e -R 0413b3aff22049b4cbc185a9693dc5d6 +P 99fcd5561b539010b7e76cad7815bb2350541f00 +R 054c025956c84db1eb39d1b4b642e446 U kwel -Z 91c151af3d118b738fbe38c98855069a +Z 31e4c308ce0684271311e37d6b50e03f diff --git a/manifest.uuid b/manifest.uuid index 74c10ed6e0..a8c9d7631f 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -99fcd5561b539010b7e76cad7815bb2350541f00 \ No newline at end of file +6cd19ddcba5fbea1be04b44699c911294618e948 \ No newline at end of file diff --git a/test/trigger4.test b/test/trigger4.test index be88eb75d0..6532d8ae96 100644 --- a/test/trigger4.test +++ b/test/trigger4.test @@ -128,6 +128,69 @@ do_test trigger4-3.7 { } } {7 99} -integrity_check trigger4-4.1 +do_test trigger4-4.1 { + db close + sqlite3 db trigtest.db + catchsql {drop table tbl; drop view vw} + execsql { + create table tbl(a integer primary key, b integer); + create view vw as select * from tbl; + create trigger t_del_tbl instead of delete on vw for each row begin + delete from tbl where a = old.a; + end; + create trigger t_upd_tbl instead of update on vw for each row begin + update tbl set a=new.a, b=new.b where a = old.a; + end; + create trigger t_ins_tbl instead of insert on vw for each row begin + insert into tbl values (new.a,new.b); + end; + insert into tbl values(101,1001); + insert into tbl values(102,1002); + insert into tbl select a+2, b+2 from tbl; + insert into tbl select a+4, b+4 from tbl; + insert into tbl select a+8, b+8 from tbl; + insert into tbl select a+16, b+16 from tbl; + insert into tbl select a+32, b+32 from tbl; + insert into tbl select a+64, b+64 from tbl; + select count(*) from vw; + } +} {128} +do_test trigger4-4.2 { + execsql {select a, b from vw where a<103 or a>226 order by a} +} {101 1001 102 1002 227 1127 228 1128} + +#test delete from view +do_test trigger4-5.1 { + catchsql {delete from vw where a>101 and a<2000} +} {0 {}} +do_test trigger4-5.2 { + execsql {select * from vw} +} {101 1001} + +#test insert into view +do_test trigger4-6.1 { + catchsql { + insert into vw values(102,1002); + insert into vw select a+2, b+2 from vw; + insert into vw select a+4, b+4 from vw; + insert into vw select a+8, b+8 from vw; + insert into vw select a+16, b+16 from vw; + insert into vw select a+32, b+32 from vw; + insert into vw select a+64, b+64 from vw; + } +} {0 {}} +do_test trigger4-6.2 { + execsql {select count(*) from vw} +} {128} + +#test update of view +do_test trigger4-7.1 { + catchsql {update vw set b=b+1000 where a>101 and a<2000} +} {0 {}} +do_test trigger4-7.2 { + execsql {select a, b from vw where a<=102 or a>=227 order by a} +} {101 1001 102 2002 227 2127 228 2128} + +integrity_check trigger4-99.9 finish_test