From: dan Date: Mon, 12 Oct 2009 15:25:28 +0000 (+0000) Subject: Update e_fkey.test to match the latest version of foreignkeys.html. X-Git-Tag: fts3-refactor~109 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1760024b62feff7e22be847749cdf8ae0ed541ba;p=thirdparty%2Fsqlite.git Update e_fkey.test to match the latest version of foreignkeys.html. FossilOrigin-Name: a2ca9f1a7a158e7b83a642a8d17549d81caea557 --- diff --git a/manifest b/manifest index c04aa226c1..d0b7b22ae4 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Extra\stest\scases\smapped\sto\sstatements\sin\sforeignkeys.html. -D 2009-10-12T11:27:01 +C Update\se_fkey.test\sto\smatch\sthe\slatest\sversion\sof\sforeignkeys.html. +D 2009-10-12T15:25:29 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in 4ca3f1dd6efa2075bcb27f4dc43eef749877740d F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -319,7 +319,7 @@ F test/descidx2.test 1310ed1326cdfed4ea2c55169631579f082d174f F test/descidx3.test 3394ad4d089335cac743c36a14129d6d931c316f F test/diskfull.test 0cede7ef9d8f415d9d3944005c76be7589bb5ebb F test/distinctagg.test 1a6ef9c87a58669438fc771450d7a72577417376 -F test/e_fkey.test b9bf4788af033c5d56e58df1e989434d942196b3 +F test/e_fkey.test f2ad0c2ed60dcab0fbea4e66d2aab524cb11f28e F test/enc.test e54531cd6bf941ee6760be041dff19a104c7acea F test/enc2.test 6d91a5286f59add0cfcbb2d0da913b76f2242398 F test/enc3.test 5c550d59ff31dccdba5d1a02ae11c7047d77c041 @@ -756,7 +756,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P d61cc0e1a1e8b4bf49016d3d14554f9c20f86f6b -R 19129dc0d2d5338325ee10c52d15ba5f +P ffa6207dd72024f01ab6f2715fe628943f178ca5 +R c29f3cf16d31eed981f65eb23f3d9cb1 U dan -Z f04f7530e0d7bdd848703c83bac7f590 +Z 389f88f392d92b0f4a083356cf2c050b diff --git a/manifest.uuid b/manifest.uuid index a078de4aa4..a0de62ae02 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -ffa6207dd72024f01ab6f2715fe628943f178ca5 \ No newline at end of file +a2ca9f1a7a158e7b83a642a8d17549d81caea557 \ No newline at end of file diff --git a/test/e_fkey.test b/test/e_fkey.test index fe039d7517..dfdda6195a 100644 --- a/test/e_fkey.test +++ b/test/e_fkey.test @@ -54,7 +54,7 @@ ifcapable trigger&&foreignkey { # Test the effects of defining OMIT_TRIGGER but not OMIT_FOREIGN_KEY. # # /* EV: R-22567-44039 */ -# /* EV: R-60444-29168 */ +# /* EV: R-41784-13339 */ # # Specifically, test that "PRAGMA foreign_keys" is a no-op in this case. # When using the pragma to query the current setting, 0 rows are returned. @@ -123,7 +123,7 @@ reset_db # Test that even if foreign keys are supported by the build, they must # be enabled using "PRAGMA foreign_keys = ON" (or similar). # -# /* EV: R-15831-45974 */ +# /* EV: R-59578-04990 */ # # This also tests that foreign key constraints are disabled by default. # @@ -176,7 +176,7 @@ do_test e_fkey-54.3 { } {0} #------------------------------------------------------------------------- -# /* EV: R-07050-54503 */ +# /* EV: R-46649-58537 */ # # Test that it is not possible to enable or disable foreign key support # while not in auto-commit mode. @@ -749,12 +749,14 @@ test_efkey_35 4 0 "INSERT INTO child VALUES('x', 'y')" # # DEFERRABLE INITIALLY DEFERRED # -# /* EV: R-54882-46975 */ +# /* EV: R-09005-28791 */ # # Also test that adding any of the following to a foreign key definition # makes the constraint IMMEDIATE: # # NOT DEFERRABLE INITIALLY DEFERRED +# NOT DEFERRABLE INITIALLY IMMEDIATE +# NOT DEFERRABLE # DEFERRABLE INITIALLY IMMEDIATE # DEFERRABLE # @@ -771,15 +773,21 @@ do_test e_fkey-29.1 { FOREIGN KEY(a, b, c) REFERENCES parent NOT DEFERRABLE INITIALLY DEFERRED ); CREATE TABLE c2(a, b, c, - FOREIGN KEY(a, b, c) REFERENCES parent DEFERRABLE INITIALLY IMMEDIATE + FOREIGN KEY(a, b, c) REFERENCES parent NOT DEFERRABLE INITIALLY IMMEDIATE ); CREATE TABLE c3(a, b, c, + FOREIGN KEY(a, b, c) REFERENCES parent NOT DEFERRABLE + ); + CREATE TABLE c4(a, b, c, + FOREIGN KEY(a, b, c) REFERENCES parent DEFERRABLE INITIALLY IMMEDIATE + ); + CREATE TABLE c5(a, b, c, FOREIGN KEY(a, b, c) REFERENCES parent DEFERRABLE ); - CREATE TABLE c4(a, b, c, FOREIGN KEY(a, b, c) REFERENCES parent); + CREATE TABLE c6(a, b, c, FOREIGN KEY(a, b, c) REFERENCES parent); -- This FK constraint is the only deferrable one. - CREATE TABLE c5(a, b, c, + CREATE TABLE c7(a, b, c, FOREIGN KEY(a, b, c) REFERENCES parent DEFERRABLE INITIALLY DEFERRED ); @@ -788,12 +796,16 @@ do_test e_fkey-29.1 { INSERT INTO parent VALUES('g', 'h', 'i'); INSERT INTO parent VALUES('j', 'k', 'l'); INSERT INTO parent VALUES('m', 'n', 'o'); + INSERT INTO parent VALUES('p', 'q', 'r'); + INSERT INTO parent VALUES('s', 't', 'u'); INSERT INTO c1 VALUES('a', 'b', 'c'); INSERT INTO c2 VALUES('d', 'e', 'f'); INSERT INTO c3 VALUES('g', 'h', 'i'); INSERT INTO c4 VALUES('j', 'k', 'l'); INSERT INTO c5 VALUES('m', 'n', 'o'); + INSERT INTO c6 VALUES('p', 'q', 'r'); + INSERT INTO c7 VALUES('s', 't', 'u'); } } {} @@ -807,25 +819,31 @@ test_efkey_29 3 "DELETE FROM parent WHERE x = 'a'" 1 test_efkey_29 4 "DELETE FROM parent WHERE x = 'd'" 1 test_efkey_29 5 "DELETE FROM parent WHERE x = 'g'" 1 test_efkey_29 6 "DELETE FROM parent WHERE x = 'j'" 1 -test_efkey_29 7 "DELETE FROM parent WHERE x = 'm'" 0 -test_efkey_29 8 "COMMIT" 1 -test_efkey_29 9 "ROLLBACK" 0 +test_efkey_29 7 "DELETE FROM parent WHERE x = 'm'" 1 +test_efkey_29 8 "DELETE FROM parent WHERE x = 'p'" 1 +test_efkey_29 9 "DELETE FROM parent WHERE x = 's'" 0 +test_efkey_29 10 "COMMIT" 1 +test_efkey_29 11 "ROLLBACK" 0 test_efkey_29 9 "BEGIN" 0 test_efkey_29 10 "UPDATE parent SET z = 'z' WHERE z = 'c'" 1 test_efkey_29 11 "UPDATE parent SET z = 'z' WHERE z = 'f'" 1 test_efkey_29 12 "UPDATE parent SET z = 'z' WHERE z = 'i'" 1 test_efkey_29 13 "UPDATE parent SET z = 'z' WHERE z = 'l'" 1 -test_efkey_29 14 "UPDATE parent SET z = 'z' WHERE z = 'o'" 0 -test_efkey_29 15 "COMMIT" 1 -test_efkey_29 16 "ROLLBACK" 0 +test_efkey_29 14 "UPDATE parent SET z = 'z' WHERE z = 'o'" 1 +test_efkey_29 15 "UPDATE parent SET z = 'z' WHERE z = 'r'" 1 +test_efkey_29 16 "UPDATE parent SET z = 'z' WHERE z = 'u'" 0 +test_efkey_29 17 "COMMIT" 1 +test_efkey_29 18 "ROLLBACK" 0 test_efkey_29 17 "BEGIN" 0 test_efkey_29 18 "INSERT INTO c1 VALUES(1, 2, 3)" 1 test_efkey_29 19 "INSERT INTO c2 VALUES(1, 2, 3)" 1 test_efkey_29 20 "INSERT INTO c3 VALUES(1, 2, 3)" 1 test_efkey_29 21 "INSERT INTO c4 VALUES(1, 2, 3)" 1 -test_efkey_29 22 "INSERT INTO c5 VALUES(1, 2, 3)" 0 +test_efkey_29 22 "INSERT INTO c5 VALUES(1, 2, 3)" 1 +test_efkey_29 22 "INSERT INTO c6 VALUES(1, 2, 3)" 1 +test_efkey_29 22 "INSERT INTO c7 VALUES(1, 2, 3)" 0 test_efkey_29 23 "COMMIT" 1 test_efkey_29 24 "INSERT INTO parent VALUES(1, 2, 3)" 0 test_efkey_29 25 "COMMIT" 0 @@ -835,7 +853,9 @@ test_efkey_29 27 "UPDATE c1 SET a = 10" 1 test_efkey_29 28 "UPDATE c2 SET a = 10" 1 test_efkey_29 29 "UPDATE c3 SET a = 10" 1 test_efkey_29 30 "UPDATE c4 SET a = 10" 1 -test_efkey_29 31 "UPDATE c5 SET a = 10" 0 +test_efkey_29 31 "UPDATE c5 SET a = 10" 1 +test_efkey_29 31 "UPDATE c6 SET a = 10" 1 +test_efkey_29 31 "UPDATE c7 SET a = 10" 0 test_efkey_29 32 "COMMIT" 1 test_efkey_29 33 "ROLLBACK" 0