[sql] Import reference version of SQLite 3.8.7.4.

third_party/sqlite/sqlite-src-3080704/test/without_rowid4.test

+# 2013-11-04
+#
 # The author disclaims copyright to this source code.  In place of
 # a legal notice, here is a blessing:
 #
 #    May you do good and not evil.
 #    May you find forgiveness for yourself and forgive others.
 #    May you share freely, never taking more than you give.
 #
 #***********************************************************************
 #
-# Regression testing of FOR EACH ROW table triggers
+# Regression testing of FOR EACH ROW table triggers on WITHOUT ROWID
+# tables.
 #
 # 1. Trigger execution order tests. 
 # These tests ensure that BEFORE and AFTER triggers are fired at the correct
 # times relative to each other and the triggering statement. 
 #
-# trigger2-1.1.*: ON UPDATE trigger execution model.
-# trigger2-1.2.*: DELETE trigger execution model.
-# trigger2-1.3.*: INSERT trigger execution model.
+# without_rowid4-1.1.*: ON UPDATE trigger execution model.
+# without_rowid4-1.2.*: DELETE trigger execution model.
+# without_rowid4-1.3.*: INSERT trigger execution model.
 #
 # 2. Trigger program execution tests.
 # These tests ensure that trigger programs execute correctly (ie. that a
 # trigger program can correctly execute INSERT, UPDATE, DELETE * SELECT
 # statements, and combinations thereof).
 #
 # 3. Selective trigger execution 
 # This tests that conditional triggers (ie. UPDATE OF triggers and triggers
 # with WHEN clauses) are fired only fired when they are supposed to be.
 #
-# trigger2-3.1: UPDATE OF triggers
-# trigger2-3.2: WHEN clause
+# without_rowid4-3.1: UPDATE OF triggers
+# without_rowid4-3.2: WHEN clause
 #
 # 4. Cascaded trigger execution 
 # Tests that trigger-programs may cause other triggers to fire. Also that a 
 # trigger-program is never executed recursively.
 # 
-# trigger2-4.1: Trivial cascading trigger
-# trigger2-4.2: Trivial recursive trigger handling 
+# without_rowid4-4.1: Trivial cascading trigger
+# without_rowid4-4.2: Trivial recursive trigger handling 
 #
 # 5. Count changes behaviour.
 # Verify that rows altered by triggers are not included in the return value
 # of the "count changes" interface.
 #
 # 6. ON CONFLICT clause handling
-# trigger2-6.1[a-f]: INSERT statements
-# trigger2-6.2[a-f]: UPDATE statements
+# without_rowid4-6.1[a-f]: INSERT statements
+# without_rowid4-6.2[a-f]: UPDATE statements
 #
 # 7. & 8. Triggers on views fire correctly.
 #
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 ifcapable {!trigger} {
   finish_test
   return
 }
 
 # The tests in this file were written before SQLite supported recursive
 # trigger invocation, and some tests depend on that to pass. So disable
 # recursive triggers for this file.
 catchsql { pragma recursive_triggers = off } 
 
 # 1.
 ifcapable subquery {
   set ii 0
   set tbl_definitions [list \
-        {CREATE TABLE tbl (a, b);}                                      \
-        {CREATE TABLE tbl (a INTEGER PRIMARY KEY, b);}                  \
-        {CREATE TABLE tbl (a, b PRIMARY KEY);}                          \
-        {CREATE TABLE tbl (a, b); CREATE INDEX tbl_idx ON tbl(b);}      \
+        {CREATE TABLE tbl (a INTEGER PRIMARY KEY, b) WITHOUT rowid;}    \
+        {CREATE TABLE tbl (a, b PRIMARY KEY) WITHOUT rowid;}            \
+        {CREATE TABLE tbl (a PRIMARY KEY, b) WITHOUT rowid;
+         CREATE INDEX tbl_idx ON tbl(b);}      \
   ]
   ifcapable tempdb {
     lappend tbl_definitions \
-        {CREATE TEMP TABLE tbl (a, b); CREATE INDEX tbl_idx ON tbl(b);} 
-    lappend tbl_definitions {CREATE TEMP TABLE tbl (a, b);}
+        {CREATE TEMP TABLE tbl (a PRIMARY KEY, b) WITHOUT rowid;
+         CREATE INDEX tbl_idx ON tbl(b);} 
     lappend tbl_definitions \
-        {CREATE TEMPORARY TABLE tbl (a INTEGER PRIMARY KEY, b);}
+        {CREATE TEMP TABLE tbl (a PRIMARY KEY, b) WITHOUT rowid}
+    lappend tbl_definitions \
+        {CREATE TEMPORARY TABLE tbl (a INTEGER PRIMARY KEY, b) WITHOUT rowid;}
   }
   foreach tbl_defn $tbl_definitions {
     incr ii
     catchsql { DROP INDEX tbl_idx; }
     catchsql {
       DROP TABLE rlog;
       DROP TABLE clog;
       DROP TABLE tbl;
       DROP TABLE other_tbl;
     }
@@ skipping 29 matching lines @@
         WHEN old.a = 1
         BEGIN
         INSERT INTO clog VALUES ( (SELECT coalesce(max(idx),0) + 1 FROM clog), 
           old.a, old.b, 
           (SELECT coalesce(sum(a),0) FROM tbl),
           (SELECT coalesce(sum(b),0) FROM tbl), 
           new.a, new.b);
       END;
     }
   
-    do_test trigger2-1.$ii.1 {
+    do_test without_rowid4-1.$ii.1 {
       set r {}
       foreach v [execsql { 
         UPDATE tbl SET a = a * 10, b = b * 10;
         SELECT * FROM rlog ORDER BY idx;
         SELECT * FROM clog ORDER BY idx;
       }] {
         lappend r [expr {int($v)}]
       }
       set r
     } [list 1 1 2  4  6 10 20 \
@@ skipping 18 matching lines @@
   
       CREATE TRIGGER delete_after_row AFTER DELETE ON tbl FOR EACH ROW
         BEGIN
         INSERT INTO rlog VALUES ( (SELECT coalesce(max(idx),0) + 1 FROM rlog), 
           old.a, old.b, 
           (SELECT coalesce(sum(a),0) FROM tbl),
           (SELECT coalesce(sum(b),0) FROM tbl), 
           0, 0);
       END;
     }
-    do_test trigger2-1.$ii.2 {
+    do_test without_rowid4-1.$ii.2 {
       set r {}
       foreach v [execsql {
         DELETE FROM tbl;
         SELECT * FROM rlog;
       }] {
         lappend r [expr {int($v)}]
       }
       set r
     } [list 1 100 100 400 300 0 0 \
             2 100 100 300 200 0 0 \
@@ skipping 13 matching lines @@
   
       CREATE TRIGGER insert_after_row AFTER INSERT ON tbl FOR EACH ROW
         BEGIN
         INSERT INTO rlog VALUES ( (SELECT coalesce(max(idx),0) + 1 FROM rlog), 
           0, 0,
           (SELECT coalesce(sum(a),0) FROM tbl),
           (SELECT coalesce(sum(b),0) FROM tbl), 
           new.a, new.b);
       END;
     }
-    do_test trigger2-1.$ii.3 {
+    do_test without_rowid4-1.$ii.3 {
       execsql {
   
         CREATE TABLE other_tbl(a, b);
         INSERT INTO other_tbl VALUES(1, 2);
         INSERT INTO other_tbl VALUES(3, 4);
         -- INSERT INTO tbl SELECT * FROM other_tbl;
         INSERT INTO tbl VALUES(5, 6);
         DROP TABLE other_tbl;
   
         SELECT * FROM rlog;
       }
     } [list 1 0 0 0 0 5 6 \
             2 0 0 5 6 5 6 ]
   
-    integrity_check trigger2-1.$ii.4
+    integrity_check without_rowid4-1.$ii.4
   }
   catchsql {
     DROP TABLE rlog;
     DROP TABLE clog;
     DROP TABLE tbl;
     DROP TABLE other_tbl;
   }
 }
 
 # 2.
@@ skipping 67 matching lines @@
     regsub -all old\.a $tr_program_cooked $oldA tr_program_cooked 
     regsub -all old\.b $tr_program_cooked $oldB tr_program_cooked 
     regsub -all old\.c $tr_program_cooked $oldC tr_program_cooked 
 
     catchsql {
       DROP TABLE tbl;
       DROP TABLE log;
     }
 
     execsql {
-      CREATE TABLE tbl(a PRIMARY KEY, b, c);
+      CREATE TABLE tbl(a PRIMARY KEY, b, c) WITHOUT rowid;
       CREATE TABLE log(a, b, c);
     }
 
     set query {SELECT * FROM tbl; SELECT * FROM log;}
     set prep "$prep; INSERT INTO log VALUES(1, 2, 3);\
              INSERT INTO log VALUES(10, 20, 30);"
 
 # Check execution of BEFORE programs:
 
     set before_data [ execsql "$prep $tr_program_cooked $statement $query" ]
 
     execsql "DELETE FROM tbl; DELETE FROM log; $prep";
     execsql "CREATE TRIGGER the_trigger BEFORE [string range $statement 0 6]\
              ON tbl BEGIN $tr_program_fixed END;"
 
-    do_test trigger2-2.$ii-before "execsql {$statement $query}" $before_data
+    do_test without_rowid4-2.$ii-before "execsql {$statement $query}" $before_data
 
     execsql "DROP TRIGGER the_trigger;"
     execsql "DELETE FROM tbl; DELETE FROM log;"
 
 # Check execution of AFTER programs
     set after_data [ execsql "$prep $statement $tr_program_cooked $query" ]
 
     execsql "DELETE FROM tbl; DELETE FROM log; $prep";
     execsql "CREATE TRIGGER the_trigger AFTER [string range $statement 0 6]\
              ON tbl BEGIN $tr_program_fixed END;"
 
-    do_test trigger2-2.$ii-after "execsql {$statement $query}" $after_data
+    do_test without_rowid4-2.$ii-after "execsql {$statement $query}" $after_data
     execsql "DROP TRIGGER the_trigger;"
 
-    integrity_check trigger2-2.$ii-integrity
+    integrity_check without_rowid4-2.$ii-integrity
   }
 }
 catchsql {
   DROP TABLE tbl;
   DROP TABLE log;
 }
 
 # 3.
 
-# trigger2-3.1: UPDATE OF triggers
+# without_rowid4-3.1: UPDATE OF triggers
 execsql {
-  CREATE TABLE tbl (a, b, c, d);
+  CREATE TABLE tbl (a, b, c, d, PRIMARY KEY(a,b,c,d)) WITHOUT rowid;
   CREATE TABLE log (a);
   INSERT INTO log VALUES (0);
   INSERT INTO tbl VALUES (0, 0, 0, 0);
   INSERT INTO tbl VALUES (1, 0, 0, 0);
   CREATE TRIGGER tbl_after_update_cd BEFORE UPDATE OF c, d ON tbl
     BEGIN
       UPDATE log SET a = a + 1;
     END;
 }
-do_test trigger2-3.1 {
+do_test without_rowid4-3.1 {
   execsql {
     UPDATE tbl SET b = 1, c = 10; -- 2
     UPDATE tbl SET b = 10; -- 0
     UPDATE tbl SET d = 4 WHERE a = 0; --1
     UPDATE tbl SET a = 4, b = 10; --0
     SELECT * FROM log;
   }
 } {3}
 execsql {
   DROP TABLE tbl;
   DROP TABLE log;
 }
 
-# trigger2-3.2: WHEN clause
+# without_rowid4-3.2: WHEN clause
 set when_triggers [list {t1 BEFORE INSERT ON tbl WHEN new.a > 20}]
 ifcapable subquery {
   lappend when_triggers \
       {t2 BEFORE INSERT ON tbl WHEN (SELECT count(*) FROM tbl) = 0}
 }
 
 execsql {
   CREATE TABLE tbl (a, b, c, d);
   CREATE TABLE log (a);
   INSERT INTO log VALUES (0);
 }
 
 foreach trig $when_triggers {
   execsql "CREATE TRIGGER $trig BEGIN UPDATE log set a = a + 1; END;"
 }
 
 ifcapable subquery {
   set t232 {1 0 1}
 } else {
   set t232 {0 0 1}
 }
-do_test trigger2-3.2 {
+do_test without_rowid4-3.2 {
   execsql { 
 
     INSERT INTO tbl VALUES(0, 0, 0, 0);     -- 1 (ifcapable subquery)
     SELECT * FROM log;
     UPDATE log SET a = 0;
 
     INSERT INTO tbl VALUES(0, 0, 0, 0);     -- 0
     SELECT * FROM log;
     UPDATE log SET a = 0;
 
     INSERT INTO tbl VALUES(200, 0, 0, 0);     -- 1
     SELECT * FROM log;
     UPDATE log SET a = 0;
   }
 } $t232
 execsql {
   DROP TABLE tbl;
   DROP TABLE log;
 }
-integrity_check trigger2-3.3
+integrity_check without_rowid4-3.3
 
 # Simple cascaded trigger
 execsql {
-  CREATE TABLE tblA(a, b);
-  CREATE TABLE tblB(a, b);
-  CREATE TABLE tblC(a, b);
+  CREATE TABLE tblA(a, b, PRIMARY KEY(a,b)) WITHOUT rowid;
+  CREATE TABLE tblB(a, b, PRIMARY KEY(a,b)) WITHOUT rowid;
+  CREATE TABLE tblC(a, b, PRIMARY KEY(a,b)) WITHOUT rowid;
 
   CREATE TRIGGER tr1 BEFORE INSERT ON tblA BEGIN
     INSERT INTO tblB values(new.a, new.b);
   END;
 
   CREATE TRIGGER tr2 BEFORE INSERT ON tblB BEGIN
     INSERT INTO tblC values(new.a, new.b);
   END;
 }
-do_test trigger2-4.1 {
+do_test without_rowid4-4.1 {
   execsql {
     INSERT INTO tblA values(1, 2);
     SELECT * FROM tblA;
     SELECT * FROM tblB;
     SELECT * FROM tblC;
   }
 } {1 2 1 2 1 2}
 execsql {
   DROP TABLE tblA;
   DROP TABLE tblB;
   DROP TABLE tblC;
 }
 
 # Simple recursive trigger
 execsql {
-  CREATE TABLE tbl(a, b, c);
+  CREATE TABLE tbl(a, b, c, PRIMARY KEY(c,a,b)) WITHOUT rowid;
   CREATE TRIGGER tbl_trig BEFORE INSERT ON tbl 
     BEGIN
-      INSERT INTO tbl VALUES (new.a, new.b, new.c);
+      INSERT INTO tbl VALUES (new.a, new.b, new.c+1);
     END;
 }
-do_test trigger2-4.2 {
+do_test without_rowid4-4.2 {
   execsql {
     INSERT INTO tbl VALUES (1, 2, 3);
     select * from tbl;
   }
-} {1 2 3 1 2 3}
+} {1 2 3 1 2 4}
 execsql {
   DROP TABLE tbl;
 }
 
 # 5.
 execsql {
-  CREATE TABLE tbl(a, b, c);
+  CREATE TABLE tbl(a, b, c, PRIMARY KEY(c,a,b)) WITHOUT rowid;
   CREATE TRIGGER tbl_trig BEFORE INSERT ON tbl 
     BEGIN
       INSERT INTO tbl VALUES (1, 2, 3);
       INSERT INTO tbl VALUES (2, 2, 3);
       UPDATE tbl set b = 10 WHERE a = 1;
       DELETE FROM tbl WHERE a = 1;
       DELETE FROM tbl;
     END;
 }
-do_test trigger2-5 {
+do_test without_rowid4-5 {
   execsql {
     INSERT INTO tbl VALUES(100, 200, 300);
   }
   db changes
 } {1}
 execsql {
   DROP TABLE tbl;
 }
 
 ifcapable conflict {
   # Handling of ON CONFLICT by INSERT statements inside triggers
   execsql {
-    CREATE TABLE tbl (a primary key, b, c);
+    CREATE TABLE tbl (a PRIMARY KEY, b, c) WITHOUT rowid;
     CREATE TRIGGER ai_tbl AFTER INSERT ON tbl BEGIN
       INSERT OR IGNORE INTO tbl values (new.a, 0, 0);
     END;
   }
-  do_test trigger2-6.1a {
+  do_test without_rowid4-6.1a {
     execsql {
       BEGIN;
       INSERT INTO tbl values (1, 2, 3);
       SELECT * from tbl;
     }
   } {1 2 3}
-  do_test trigger2-6.1b {
+  do_test without_rowid4-6.1b {
     catchsql {
       INSERT OR ABORT INTO tbl values (2, 2, 3);
     }
-  } {1 {column a is not unique}}
-  do_test trigger2-6.1c {
+  } {1 {UNIQUE constraint failed: tbl.a}}
+  do_test without_rowid4-6.1c {
     execsql {
       SELECT * from tbl;
     }
   } {1 2 3}
-  do_test trigger2-6.1d {
+  do_test without_rowid4-6.1d {
     catchsql {
       INSERT OR FAIL INTO tbl values (2, 2, 3);
     }
-  } {1 {column a is not unique}}
-  do_test trigger2-6.1e {
+  } {1 {UNIQUE constraint failed: tbl.a}}
+  do_test without_rowid4-6.1e {
     execsql {
       SELECT * from tbl;
     }
   } {1 2 3 2 2 3}
-  do_test trigger2-6.1f {
+  do_test without_rowid4-6.1f {
     execsql {
       INSERT OR REPLACE INTO tbl values (2, 2, 3);
       SELECT * from tbl;
     }
   } {1 2 3 2 0 0}
-  do_test trigger2-6.1g {
+  do_test without_rowid4-6.1g {
     catchsql {
       INSERT OR ROLLBACK INTO tbl values (3, 2, 3);
     }
-  } {1 {column a is not unique}}
-  do_test trigger2-6.1h {
+  } {1 {UNIQUE constraint failed: tbl.a}}
+  do_test without_rowid4-6.1h {
     execsql {
       SELECT * from tbl;
     }
   } {}
   execsql {DELETE FROM tbl}
   
   
   # Handling of ON CONFLICT by UPDATE statements inside triggers
   execsql {
     INSERT INTO tbl values (4, 2, 3);
     INSERT INTO tbl values (6, 3, 4);
     CREATE TRIGGER au_tbl AFTER UPDATE ON tbl BEGIN
       UPDATE OR IGNORE tbl SET a = new.a, c = 10;
     END;
   }
-  do_test trigger2-6.2a {
+  do_test without_rowid4-6.2a {
     execsql {
       BEGIN;
       UPDATE tbl SET a = 1 WHERE a = 4;
       SELECT * from tbl;
     }
   } {1 2 10 6 3 4}
-  do_test trigger2-6.2b {
+  do_test without_rowid4-6.2b {
     catchsql {
       UPDATE OR ABORT tbl SET a = 4 WHERE a = 1;
     }
-  } {1 {column a is not unique}}
-  do_test trigger2-6.2c {
+  } {1 {UNIQUE constraint failed: tbl.a}}
+  do_test without_rowid4-6.2c {
     execsql {
       SELECT * from tbl;
     }
   } {1 2 10 6 3 4}
-  do_test trigger2-6.2d {
+  do_test without_rowid4-6.2d {
     catchsql {
       UPDATE OR FAIL tbl SET a = 4 WHERE a = 1;
     }
-  } {1 {column a is not unique}}
-  do_test trigger2-6.2e {
+  } {1 {UNIQUE constraint failed: tbl.a}}
+  do_test without_rowid4-6.2e {
     execsql {
       SELECT * from tbl;
     }
   } {4 2 10 6 3 4}
-  do_test trigger2-6.2f.1 {
+  do_test without_rowid4-6.2f.1 {
     execsql {
       UPDATE OR REPLACE tbl SET a = 1 WHERE a = 4;
       SELECT * from tbl;
     }
   } {1 3 10}
-  do_test trigger2-6.2f.2 {
+  do_test without_rowid4-6.2f.2 {
     execsql {
       INSERT INTO tbl VALUES (2, 3, 4);
       SELECT * FROM tbl;
     }
   } {1 3 10 2 3 4}
-  do_test trigger2-6.2g {
+  do_test without_rowid4-6.2g {
     catchsql {
       UPDATE OR ROLLBACK tbl SET a = 4 WHERE a = 1;
     }
-  } {1 {column a is not unique}}
-  do_test trigger2-6.2h {
+  } {1 {UNIQUE constraint failed: tbl.a}}
+  do_test without_rowid4-6.2h {
     execsql {
       SELECT * from tbl;
     }
   } {4 2 3 6 3 4}
   execsql {
     DROP TABLE tbl;
   }
 } ; # ifcapable conflict
 
 # 7. Triggers on views
 ifcapable view {
 
-do_test trigger2-7.1 {
+do_test without_rowid4-7.1 {
   execsql {
-  CREATE TABLE ab(a, b);
-  CREATE TABLE cd(c, d);
+  CREATE TABLE ab(a, b, PRIMARY KEY(a,b)) WITHOUT rowid;
+  CREATE TABLE cd(c, d, PRIMARY KEY(c,d)) WITHOUT rowid;
   INSERT INTO ab VALUES (1, 2);
   INSERT INTO ab VALUES (0, 0);
   INSERT INTO cd VALUES (3, 4);
 
   CREATE TABLE tlog(ii INTEGER PRIMARY KEY, 
       olda, oldb, oldc, oldd, newa, newb, newc, newd);
 
   CREATE VIEW abcd AS SELECT a, b, c, d FROM ab, cd;
 
   CREATE TRIGGER before_update INSTEAD OF UPDATE ON abcd BEGIN
@@ skipping 18 matching lines @@
     INSERT INTO tlog VALUES(NULL, 
         0, 0, 0, 0, new.a, new.b, new.c, new.d);
   END;
    CREATE TRIGGER after_insert INSTEAD OF INSERT ON abcd BEGIN
     INSERT INTO tlog VALUES(NULL, 
         0, 0, 0, 0, new.a, new.b, new.c, new.d);
    END;
   }
 } {};
 
-do_test trigger2-7.2 {
+do_test without_rowid4-7.2 {
   execsql {
     UPDATE abcd SET a = 100, b = 5*5 WHERE a = 1;
     DELETE FROM abcd WHERE a = 1;
     INSERT INTO abcd VALUES(10, 20, 30, 40);
     SELECT * FROM tlog;
   }
 } [ list 1 1 2 3 4 100 25 3 4 \
          2 1 2 3 4 100 25 3 4 \
          3 1 2 3 4 0 0 0 0 \
          4 1 2 3 4 0 0 0 0 \
          5 0 0 0 0 10 20 30 40 \
          6 0 0 0 0 10 20 30 40 ]
 
-do_test trigger2-7.3 {
+do_test without_rowid4-7.3 {
   execsql {
     DELETE FROM tlog;
     INSERT INTO abcd VALUES(10, 20, 30, 40);
     UPDATE abcd SET a = 100, b = 5*5 WHERE a = 1;
     DELETE FROM abcd WHERE a = 1;
     SELECT * FROM tlog;
   }
 } [ list \
    1 0 0 0 0 10 20 30 40 \
    2 0 0 0 0 10 20 30 40 \
    3 1 2 3 4 100 25 3 4 \
    4 1 2 3 4 100 25 3 4 \
    5 1 2 3 4 0 0 0 0 \
    6 1 2 3 4 0 0 0 0 \
 ]
-do_test trigger2-7.4 {
+do_test without_rowid4-7.4 {
   execsql {
     DELETE FROM tlog;
     DELETE FROM abcd WHERE a = 1;
     INSERT INTO abcd VALUES(10, 20, 30, 40);
     UPDATE abcd SET a = 100, b = 5*5 WHERE a = 1;
     SELECT * FROM tlog;
   }
 } [ list \
    1 1 2 3 4 0 0 0 0 \
    2 1 2 3 4 0 0 0 0 \
    3 0 0 0 0 10 20 30 40 \
    4 0 0 0 0 10 20 30 40 \
    5 1 2 3 4 100 25 3 4 \
    6 1 2 3 4 100 25 3 4 \
 ]
 
-do_test trigger2-8.1 {
+do_test without_rowid4-8.1 {
   execsql {
-    CREATE TABLE t1(a,b,c);
+    CREATE TABLE t1(a,b,c, PRIMARY KEY(a,b,c)) WITHOUT rowid;
     INSERT INTO t1 VALUES(1,2,3);
     CREATE VIEW v1 AS
       SELECT a+b AS x, b+c AS y, a+c AS z FROM t1;
     SELECT * FROM v1;
   }
 } {3 5 4}
-do_test trigger2-8.2 {
+do_test without_rowid4-8.2 {
   execsql {
     CREATE TABLE v1log(a,b,c,d,e,f);
     CREATE TRIGGER r1 INSTEAD OF DELETE ON v1 BEGIN
       INSERT INTO v1log VALUES(OLD.x,NULL,OLD.y,NULL,OLD.z,NULL);
     END;
     DELETE FROM v1 WHERE x=1;
     SELECT * FROM v1log;
   }
 } {}
-do_test trigger2-8.3 {
+do_test without_rowid4-8.3 {
   execsql {
     DELETE FROM v1 WHERE x=3;
     SELECT * FROM v1log;
   }
 } {3 {} 5 {} 4 {}}
-do_test trigger2-8.4 {
+do_test without_rowid4-8.4 {
   execsql {
     INSERT INTO t1 VALUES(4,5,6);
     DELETE FROM v1log;
     DELETE FROM v1 WHERE y=11;
     SELECT * FROM v1log;
   }
 } {9 {} 11 {} 10 {}}
-do_test trigger2-8.5 {
+do_test without_rowid4-8.5 {
   execsql {
     CREATE TRIGGER r2 INSTEAD OF INSERT ON v1 BEGIN
       INSERT INTO v1log VALUES(NULL,NEW.x,NULL,NEW.y,NULL,NEW.z);
     END;
     DELETE FROM v1log;
     INSERT INTO v1 VALUES(1,2,3);
     SELECT * FROM v1log;
   }
 } {{} 1 {} 2 {} 3}
-do_test trigger2-8.6 {
+do_test without_rowid4-8.6 {
   execsql {
     CREATE TRIGGER r3 INSTEAD OF UPDATE ON v1 BEGIN
       INSERT INTO v1log VALUES(OLD.x,NEW.x,OLD.y,NEW.y,OLD.z,NEW.z);
     END;
     DELETE FROM v1log;
     UPDATE v1 SET x=x+100, y=y+200, z=z+300;
     SELECT * FROM v1log;
   }
 } {3 103 5 205 4 304 9 109 11 211 10 310}
 
 # At one point the following was causing a segfault.
-do_test trigger2-9.1 {
+do_test without_rowid4-9.1 {
   execsql {
     CREATE TABLE t3(a TEXT, b TEXT);
     CREATE VIEW v3 AS SELECT t3.a FROM t3;
     CREATE TRIGGER trig1 INSTEAD OF DELETE ON v3 BEGIN
       SELECT 1;
     END;
     DELETE FROM v3 WHERE a = 1;
   }
 } {}
 
 } ;# ifcapable view
 
-integrity_check trigger2-9.9
+integrity_check without_rowid4-9.9
 
 finish_test