Merge tag 'upstream/3.2.0'

Upstream version 3.2.0

# gpg: Signature made Thu 16 Oct 2014 10:51:39 PM EDT using RSA key ID 374BBE81
# gpg: Good signature from "Hans-Christoph Steiner <hans@guardianproject.info>"
# gpg:                 aka "Hans-Christoph Steiner <hans@eds.org>"
# gpg:                 aka "Hans-Christoph Steiner <hans@at.or.at>"
# gpg:                 aka "[jpeg image of size 5408]"

1 files changed, 11 insertions, 11 deletions

diff --git a/test/fkey3.test b/test/fkey3.test
index 6a11f88..a8d0382 100644
--- a/test/fkey3.test
+++ b/test/fkey3.test
@@ -43,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 {
@@ -95,17 +95,17 @@ do_execsql_test 3.1.1 {
 } {}
 do_catchsql_test 3.1.2 {
   INSERT INTO t3 VALUES(NULL, 2, 5, 2);
-} {1 {foreign key constraint failed}}
+} {1 {FOREIGN KEY constraint failed}}
 do_catchsql_test 3.1.3 {
   INSERT INTO t3 VALUES(NULL, 3, 5, 2);
-} {1 {foreign key constraint failed}}
+} {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}}
+} {1 {FOREIGN KEY constraint failed}}
 
 do_execsql_test 3.3.1 {
   CREATE TABLE t5(a INTEGER PRIMARY KEY, b REFERENCES t5(a));
@@ -113,7 +113,7 @@ do_execsql_test 3.3.1 {
 } {}
 do_catchsql_test 3.3.2 {
   INSERT INTO t5 VALUES(NULL, 3);
-} {1 {foreign key constraint failed}}
+} {1 {FOREIGN KEY constraint failed}}
 
 do_execsql_test 3.4.1 {
   CREATE TABLE t6(a INTEGER PRIMARY KEY, b, c, d,
@@ -127,7 +127,7 @@ 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}}
+} {1 {FOREIGN KEY constraint failed}}
 
 do_execsql_test 3.4.7 {
   INSERT INTO t6 VALUES(100, 'one', 100, 'one');
@@ -149,10 +149,10 @@ 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}}
+} {1 {FOREIGN KEY constraint failed}}
 do_catchsql_test 3.5.5  { 
   INSERT INTO t7 VALUES('x', 450, 'x', 451);
-} {1 {foreign key constraint failed}}
+} {1 {FOREIGN KEY constraint failed}}
 
 
 do_execsql_test 3.6.1 {
@@ -163,7 +163,7 @@ do_execsql_test 3.6.1 {
 }
 do_catchsql_test 3.6.2 { 
   UPDATE t8 SET d = 2; 
-} {1 {foreign key constraint failed}}
+} {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; }
 
@@ -181,6 +181,6 @@ do_catchsql_test 3.6.5 {
   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}}
+} {1 {FOREIGN KEY constraint failed}}
 
 finish_test