| Index: third_party/sqlite/src/test/fkey3.test | 
| diff --git a/third_party/sqlite/src/test/fkey3.test b/third_party/sqlite/src/test/fkey3.test | 
| index 88b5aad370e225b42634e542f1107cb6c972fe7e..a8d038202074c5723177fa12d680fe1dca8fd01b 100644 | 
| --- a/third_party/sqlite/src/test/fkey3.test | 
| +++ b/third_party/sqlite/src/test/fkey3.test | 
| @@ -21,6 +21,8 @@ ifcapable {!foreignkey||!trigger} { | 
| return | 
| } | 
|  | 
| +set testprefix fkey3 | 
| + | 
| # Create a table and some data to work with. | 
| # | 
| do_test fkey3-1.1 { | 
| @@ -41,13 +43,13 @@ do_test fkey3-1.2 { | 
| catchsql { | 
| DELETE FROM t1 WHERE x=100; | 
| } | 
| -} {1 {foreign key constraint failed}} | 
| +} {1 {FOREIGN KEY constraint failed}} | 
|  | 
| do_test fkey3-1.3 { | 
| catchsql { | 
| DROP TABLE t1; | 
| } | 
| -} {1 {foreign key constraint failed}} | 
| +} {1 {FOREIGN KEY constraint failed}} | 
|  | 
| do_test fkey3-1.4 { | 
| execsql { | 
| @@ -77,4 +79,108 @@ do_test fkey3-2.1 { | 
| } | 
| } {1 100 1 101 2 100 2 101} | 
|  | 
| + | 
| +#------------------------------------------------------------------------- | 
| +# The following tests - fkey-3.* - test some edge cases to do with | 
| +# inserting rows into tables that have foreign keys where the parent | 
| +# table is the same as the child table. Especially cases where the | 
| +# new row being inserted matches itself. | 
| +# | 
| +do_execsql_test 3.1.1 { | 
| +  CREATE TABLE t3(a, b, c, d, | 
| +    UNIQUE(a, b), | 
| +    FOREIGN KEY(c, d) REFERENCES t3(a, b) | 
| +  ); | 
| +  INSERT INTO t3 VALUES(1, 2, 1, 2); | 
| +} {} | 
| +do_catchsql_test 3.1.2 { | 
| +  INSERT INTO t3 VALUES(NULL, 2, 5, 2); | 
| +} {1 {FOREIGN KEY constraint failed}} | 
| +do_catchsql_test 3.1.3 { | 
| +  INSERT INTO t3 VALUES(NULL, 3, 5, 2); | 
| +} {1 {FOREIGN KEY constraint failed}} | 
| + | 
| +do_execsql_test 3.2.1 { | 
| +  CREATE TABLE t4(a UNIQUE, b REFERENCES t4(a)); | 
| +} | 
| +do_catchsql_test 3.2.2 { | 
| +  INSERT INTO t4 VALUES(NULL, 1); | 
| +} {1 {FOREIGN KEY constraint failed}} | 
| + | 
| +do_execsql_test 3.3.1 { | 
| +  CREATE TABLE t5(a INTEGER PRIMARY KEY, b REFERENCES t5(a)); | 
| +  INSERT INTO t5 VALUES(NULL, 1); | 
| +} {} | 
| +do_catchsql_test 3.3.2 { | 
| +  INSERT INTO t5 VALUES(NULL, 3); | 
| +} {1 {FOREIGN KEY constraint failed}} | 
| + | 
| +do_execsql_test 3.4.1 { | 
| +  CREATE TABLE t6(a INTEGER PRIMARY KEY, b, c, d, | 
| +    FOREIGN KEY(c, d) REFERENCES t6(a, b) | 
| +  ); | 
| +  CREATE UNIQUE INDEX t6i ON t6(b, a); | 
| +} | 
| +do_execsql_test 3.4.2  { INSERT INTO t6 VALUES(NULL, 'a', 1, 'a'); } {} | 
| +do_execsql_test 3.4.3  { INSERT INTO t6 VALUES(2, 'a', 2, 'a');    } {} | 
| +do_execsql_test 3.4.4  { INSERT INTO t6 VALUES(NULL, 'a', 1, 'a'); } {} | 
| +do_execsql_test 3.4.5  { INSERT INTO t6 VALUES(5, 'a', 2, 'a'); } {} | 
| +do_catchsql_test 3.4.6 { | 
| +  INSERT INTO t6 VALUES(NULL, 'a', 65, 'a'); | 
| +} {1 {FOREIGN KEY constraint failed}} | 
| + | 
| +do_execsql_test 3.4.7 { | 
| +  INSERT INTO t6 VALUES(100, 'one', 100, 'one'); | 
| +  DELETE FROM t6 WHERE a = 100; | 
| +} | 
| +do_execsql_test 3.4.8 { | 
| +  INSERT INTO t6 VALUES(100, 'one', 100, 'one'); | 
| +  UPDATE t6 SET c = 1, d = 'a' WHERE a = 100; | 
| +  DELETE FROM t6 WHERE a = 100; | 
| +} | 
| + | 
| +do_execsql_test 3.5.1 { | 
| +  CREATE TABLE t7(a, b, c, d INTEGER PRIMARY KEY, | 
| +    FOREIGN KEY(c, d) REFERENCES t7(a, b) | 
| +  ); | 
| +  CREATE UNIQUE INDEX t7i ON t7(a, b); | 
| +} | 
| +do_execsql_test 3.5.2  { INSERT INTO t7 VALUES('x', 1, 'x', NULL) } {} | 
| +do_execsql_test 3.5.3  { INSERT INTO t7 VALUES('x', 2, 'x', 2) } {} | 
| +do_catchsql_test 3.5.4  { | 
| +  INSERT INTO t7 VALUES('x', 450, 'x', NULL); | 
| +} {1 {FOREIGN KEY constraint failed}} | 
| +do_catchsql_test 3.5.5  { | 
| +  INSERT INTO t7 VALUES('x', 450, 'x', 451); | 
| +} {1 {FOREIGN KEY constraint failed}} | 
| + | 
| + | 
| +do_execsql_test 3.6.1 { | 
| +  CREATE TABLE t8(a, b, c, d, e, FOREIGN KEY(c, d) REFERENCES t8(a, b)); | 
| +  CREATE UNIQUE INDEX t8i1 ON t8(a, b); | 
| +  CREATE UNIQUE INDEX t8i2 ON t8(c); | 
| +  INSERT INTO t8 VALUES(1, 1, 1, 1, 1); | 
| +} | 
| +do_catchsql_test 3.6.2 { | 
| +  UPDATE t8 SET d = 2; | 
| +} {1 {FOREIGN KEY constraint failed}} | 
| +do_execsql_test 3.6.3 { UPDATE t8 SET d = 1; } | 
| +do_execsql_test 3.6.4 { UPDATE t8 SET e = 2; } | 
| + | 
| +do_catchsql_test 3.6.5 { | 
| +  CREATE TABLE TestTable ( | 
| +    id INTEGER PRIMARY KEY, | 
| +    name text, | 
| +    source_id integer not null, | 
| +    parent_id integer, | 
| + | 
| +    foreign key(source_id, parent_id) references TestTable(source_id, id) | 
| +  ); | 
| +  CREATE UNIQUE INDEX testindex on TestTable(source_id, id); | 
| +  PRAGMA foreign_keys=1; | 
| +  INSERT INTO TestTable VALUES (1, 'parent', 1, null); | 
| +  INSERT INTO TestTable VALUES (2, 'child', 1, 1); | 
| +  UPDATE TestTable SET parent_id=1000 where id=2; | 
| +} {1 {FOREIGN KEY constraint failed}} | 
| + | 
| finish_test | 
|  |