Add the conflict2.test script. Fix issues discovered by this script.

FossilOrigin-Name: 294ed33756b06375e56c41f1088d42ee48adbdc8
2013-11-05 01:59:07 +00:00
parent d269461c91
commit 00012df46d
18 changed files with 937 additions and 78 deletions
@@ -30,7 +30,7 @@ do_test schema5-1.1 {
 } {1 2 3}
 do_test schema5-1.2 {
  catchsql {INSERT INTO t1 VALUES(1,3,4);}
-} {1 {column a is not unique}}
+} {1 {PRIMARY KEY must be unique}}
 do_test schema5-1.3 {
  db eval {
    DROP TABLE t1;
@@ -60,7 +60,7 @@ do_test schema5-1.6 {
 } {1 {column a is not unique}}
 do_test schema5-1.7 {
  catchsql {INSERT INTO t1 VALUES(10,2,3)}
-} {1 {columns b, c are not unique}}
+} {1 {PRIMARY KEY must be unique}}