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, 6 insertions, 6 deletions

diff --git a/test/trigger2.test b/test/trigger2.test
index b4b922a..7b939bd 100644
--- a/test/trigger2.test
+++ b/test/trigger2.test
@@ -497,7 +497,7 @@ ifcapable conflict {
     catchsql {
       INSERT OR ABORT INTO tbl values (2, 2, 3);
     }
-  } {1 {column a is not unique}}
+  } {1 {UNIQUE constraint failed: tbl.a}}
   do_test trigger2-6.1c {
     execsql {
       SELECT * from tbl;
@@ -507,7 +507,7 @@ ifcapable conflict {
     catchsql {
       INSERT OR FAIL INTO tbl values (2, 2, 3);
     }
-  } {1 {column a is not unique}}
+  } {1 {UNIQUE constraint failed: tbl.a}}
   do_test trigger2-6.1e {
     execsql {
       SELECT * from tbl;
@@ -523,7 +523,7 @@ ifcapable conflict {
     catchsql {
       INSERT OR ROLLBACK INTO tbl values (3, 2, 3);
     }
-  } {1 {column a is not unique}}
+  } {1 {UNIQUE constraint failed: tbl.a}}
   do_test trigger2-6.1h {
     execsql {
       SELECT * from tbl;
@@ -551,7 +551,7 @@ ifcapable conflict {
     catchsql {
       UPDATE OR ABORT tbl SET a = 4 WHERE a = 1;
     }
-  } {1 {column a is not unique}}
+  } {1 {UNIQUE constraint failed: tbl.a}}
   do_test trigger2-6.2c {
     execsql {
       SELECT * from tbl;
@@ -561,7 +561,7 @@ ifcapable conflict {
     catchsql {
       UPDATE OR FAIL tbl SET a = 4 WHERE a = 1;
     }
-  } {1 {column a is not unique}}
+  } {1 {UNIQUE constraint failed: tbl.a}}
   do_test trigger2-6.2e {
     execsql {
       SELECT * from tbl;
@@ -583,7 +583,7 @@ ifcapable conflict {
     catchsql {
       UPDATE OR ROLLBACK tbl SET a = 4 WHERE a = 1;
     }
-  } {1 {column a is not unique}}
+  } {1 {UNIQUE constraint failed: tbl.a}}
   do_test trigger2-6.2h {
     execsql {
       SELECT * from tbl;