1 files changed, 14 insertions, 5 deletions
diff --git a/test/without_rowid1.test b/test/without_rowid1.test
index 0095fab0c..5d0bc8110 100644
--- a/test/without_rowid1.test
+++ b/test/without_rowid1.test
@@ -493,18 +493,27 @@ ifcapable altertable {
 #
 reset_db
 sqlite3_limit db SQLITE_LIMIT_COLUMN 8
-do_catchsql_test 16.1 {
+do_execsql_test 16.1 {
   CREATE TABLE t1(
     c1,c2,c3,c4,c5,c6,c7,c8,
     PRIMARY KEY(c1,c2,c1 COLLATE NOCASE)
   ) WITHOUT ROWID;
-} {1 {too many columns on sqlite_autoindex_t1_1}}
-do_catchsql_test 16.2 {
-  CREATE TABLE t1(
+} {}
+do_execsql_test 16.2 {
+  CREATE TABLE t2(
+    c1,c2,c3,c4,c5,c6,c7,c8,
+    PRIMARY KEY(c1 COLLATE nocase,c1 COLLATE rtrim,
+                c2 COLLATE nocase,c2 COLLATE rtrim,
+                c3 COLLATE nocase,c3 COLLATE rtrim,
+                c4 COLLATE nocase,c4 COLLATE rtrim)
+  ) WITHOUT ROWID;
+} {}
+do_execsql_test 16.3 {
+  CREATE TABLE t3(
     c1,c2,c3,c4,c5,c6,c7,c8,
     PRIMARY KEY(c1,c2),
     UNIQUE(c3,c4,c5,c6,c7,c8,c3 COLLATE nocase)
   ) WITHOUT ROWID;
-} {1 {too many columns on sqlite_autoindex_t1_2}}
+} {}
 
 finish_test