From 07fcc26824e522438a066b9fde8de79ebd401c22 Mon Sep 17 00:00:00 2001 From: dan Date: Thu, 8 Oct 2009 06:24:41 +0000 Subject: [PATCH] Update triggerC.test to match the change to the way the trigger-recursion limit is handled. FossilOrigin-Name: 5806925283b889867567c4ad92518bad000e9d9d --- manifest | 24 +++++++----------------- manifest.uuid | 2 +- test/triggerC.test | 16 ++++++++-------- 3 files changed, 16 insertions(+), 26 deletions(-) diff --git a/manifest b/manifest index fb9241f6c4..1ef11c1a90 100644 --- a/manifest +++ b/manifest @@ -1,8 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -C Fix\sa\ssegfault\sthat\scan\soccur\sfollowing\san\sOOM\sfault\swhile\srenaming\sa\ntable\sholding\sforeign\skey\sconstraints. -D 2009-10-08T01:43:55 +C Update\striggerC.test\sto\smatch\sthe\schange\sto\sthe\sway\sthe\strigger-recursion\slimit\sis\shandled. +D 2009-10-08T06:24:41 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in 4ca3f1dd6efa2075bcb27f4dc43eef749877740d F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -691,7 +688,7 @@ F test/trigger8.test 30cb0530bd7c4728055420e3f739aa00412eafa4 F test/trigger9.test 5b0789f1c5c4600961f8e68511b825b87be53e31 F test/triggerA.test 0718ad2d9bfef27c7af00e636df79bee6b988da7 F test/triggerB.test 56780c031b454abac2340dbb3b71ac5c56c3d7fe -F test/triggerC.test 4b1c11936b717527f321a7509c562dee7a19a55f +F test/triggerC.test 0acc1d22d9c3d6cf0018bf795d544732a25657dc F test/types.test 9a825ec8eea4e965d7113b74c76a78bb5240f2ac F test/types2.test 3555aacf8ed8dc883356e59efc314707e6247a84 F test/types3.test a0f66bf12f80fad89493535474f7a6d16fa58150 @@ -759,14 +756,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P 56f609da4bfcc794e1f8573652dcde8515e87098 -R 030802ae3699bd33d88485a0ad53a056 -U drh -Z d1dc976e15a4f894cd3c81a147b52256 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) - -iD8DBQFKzUPeoxKgR168RlERAnyfAJ9jtPWgzZk8sC0quRAQl5Y5pPxWLgCffYKC -uK+noTMwegf4WgXFxPbKJ4s= -=q6eQ ------END PGP SIGNATURE----- +P 33973814c67bc9bac575bf2249df6530dd2184d3 +R dd04ee19d49e7a136c94ca39ddd17c66 +U dan +Z a4b0521924041d87ab332fd1d83d83e4 diff --git a/manifest.uuid b/manifest.uuid index 6f23ba6741..78dc8d9986 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -33973814c67bc9bac575bf2249df6530dd2184d3 \ No newline at end of file +5806925283b889867567c4ad92518bad000e9d9d \ No newline at end of file diff --git a/test/triggerC.test b/test/triggerC.test index dfcebffe66..a86269f1d4 100644 --- a/test/triggerC.test +++ b/test/triggerC.test @@ -304,12 +304,12 @@ do_test triggerC-3.2.2 { do_test triggerC-3.3.1 { catchsql { - INSERT INTO t3b VALUES(1000); + INSERT INTO t3b VALUES(1001); } } {0 {}} do_test triggerC-3.3.2 { db eval {SELECT count(*), max(x), min(x) FROM t3b} -} {1001 2000 1000} +} {1000 2000 1001} do_test triggerC-3.4.1 { catchsql { @@ -324,17 +324,17 @@ do_test triggerC-3.4.2 { do_test triggerC-3.5.1 { sqlite3_limit db SQLITE_LIMIT_TRIGGER_DEPTH 100 catchsql { - INSERT INTO t3b VALUES(1900); + INSERT INTO t3b VALUES(1901); } } {0 {}} do_test triggerC-3.5.2 { db eval {SELECT count(*), max(x), min(x) FROM t3b} -} {101 2000 1900} +} {100 2000 1901} do_test triggerC-3.5.3 { catchsql { DELETE FROM t3b; - INSERT INTO t3b VALUES(1899); + INSERT INTO t3b VALUES(1900); } } {1 {too many levels of trigger recursion}} do_test triggerC-3.5.4 { @@ -344,17 +344,17 @@ do_test triggerC-3.5.4 { do_test triggerC-3.6.1 { sqlite3_limit db SQLITE_LIMIT_TRIGGER_DEPTH 1 catchsql { - INSERT INTO t3b VALUES(1999); + INSERT INTO t3b VALUES(2000); } } {0 {}} do_test triggerC-3.6.2 { db eval {SELECT count(*), max(x), min(x) FROM t3b} -} {2 2000 1999} +} {1 2000 2000} do_test triggerC-3.6.3 { catchsql { DELETE FROM t3b; - INSERT INTO t3b VALUES(1998); + INSERT INTO t3b VALUES(1999); } } {1 {too many levels of trigger recursion}} do_test triggerC-3.6.4 { -- 2.47.2