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, 32 insertions, 1 deletions

diff --git a/test/tkt1567.test b/test/tkt1567.test
index 6c4548a..cb1a6be 100644
--- a/test/tkt1567.test
+++ b/test/tkt1567.test
@@ -40,7 +40,7 @@ do_test tkt1567-1.4 {
   catchsql {
     UPDATE t1 SET a = CASE WHEN rowid<90 THEN substr(a,1,10) ELSE '9999' END;
   }
-} {1 {column a is not unique}}
+} {1 {UNIQUE constraint failed: t1.a}}
 do_test tkt1567-1.5 {
   execsql {
     COMMIT;
@@ -48,4 +48,35 @@ do_test tkt1567-1.5 {
 } {}
 integrity_check tkt1567-1.6
 
+do_test tkt1567-2.1 {
+  execsql {
+    CREATE TABLE t2(a TEXT PRIMARY KEY, rowid INT) WITHOUT rowid;
+  }
+  set bigstr abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ
+  for {set i 0} {$i<100} {incr i} {
+    set x [format %5d [expr $i*2]]
+    set sql "INSERT INTO t2 VALUES('$x-$bigstr', $i+1)"
+    execsql $sql
+  }
+} {}
+integrity_check tkt1567-2.2
+
+do_test tkt1567-2.3 {
+  execsql {
+    BEGIN;
+    UPDATE t2 SET a = a||'x' WHERE rowid%2==0;
+  }
+} {}
+do_test tkt1567-2.4 {
+  catchsql {
+    UPDATE t2 SET a = CASE WHEN rowid<90 THEN substr(a,1,10) ELSE '9999' END;
+  }
+} {1 {UNIQUE constraint failed: t2.a}}
+do_test tkt1567-2.5 {
+  execsql {
+    COMMIT;
+  }
+} {}
+integrity_check tkt1567-2.6
+
 finish_test