Fix a test-suite error made in check-in (2132) (CVS 2136)

FossilOrigin-Name: 48c7eb7fb9fbc2166aaa7dbdb7c7e92c68f8eff3

diff --git a/manifest b/manifest
index 1af65e0daa0c3c478826852b0c457e6585f1a732..74766873febc159a3d4f692268fa947ee843c4ce 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Back\sout\schanges\sallowing\swrites\sto\stables\sthat\shave\sopen\scursors.\s(CVS\s2135)
-D 2004-11-22T10:02:23
+C Fix\sa\stest-suite\serror\smade\sin\scheck-in\s(2132)\s(CVS\s2136)
+D 2004-11-22T10:20:13
 F Makefile.in 8291610f5839939a5fbff4dbbf85adb0fe1ac37f
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README a01693e454a00cc117967e3f9fdab2d4d52e9bc1
@@ -185,7 +185,7 @@ F test/threadtest1.c 6029d9c5567db28e6dc908a0c63099c3ba6c383b
 F test/threadtest2.c 97a830d53c24c42290501fdfba4a6e5bdd34748b
 F test/trace.test a54fa8df0d01cf827289a7659d78959e8fd2f955
 F test/trans.test 29645b344d2b9b6792793562b12340177ddd8f96
-F test/trigger1.test 5fd454a431bae6cf75783ab539c4e65802c244fa
+F test/trigger1.test 65ee61f6a0f9e61badbd620ec17979ceb391efa1
 F test/trigger2.test 534390be509127859fee7c23018f03b9bf21a88f
 F test/trigger3.test 9102fd3933db294dc654b5aee9edfe9e94f2b9e2
 F test/trigger4.test e7c0812b14750754602468f15495260e8c6625e0
@@ -259,7 +259,7 @@ F www/tclsqlite.tcl 560ecd6a916b320e59f2917317398f3d59b7cc25
 F www/vdbe.tcl 095f106d93875c94b47367384ebc870517431618
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl fdacb0ba2d39831e8a6240d05a490026ad4c4e4c
-P af635cab8a1d761c469e35208dda08a29f0964a1
-R 3f35736f01d9cae236fc378ee100c137
+P ec6b48f4b2abea231b050a8a9d18c2ab12579c8e
+R 0b138ab4e569bea68e7531555ba597f5
 U danielk1977
-Z e0fe6ec685043d5f5e9e23d0eb7ff00a
+Z 79e8cbc70189cea680ff0b42cb1f7509

diff --git a/manifest.uuid b/manifest.uuid
index 3d91a4bd34b9b96a0476e4f9af3a82699c68a098..7d0c208f6f3eb17e497027971ef81eaed2f13d68 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ec6b48f4b2abea231b050a8a9d18c2ab12579c8e
\ No newline at end of file
+48c7eb7fb9fbc2166aaa7dbdb7c7e92c68f8eff3
\ No newline at end of file

diff --git a/test/trigger1.test b/test/trigger1.test
index e964d2f895c261c62c3d00992a5e5e84e0a1fff1..304750a458260fef30c5ce728408765841135f66 100644 (file)
--- a/test/trigger1.test
+++ b/test/trigger1.test
@@ -320,9 +320,13 @@ integrity_check trigger-5.1
 # trigger works.  Then drop the trigger.  Make sure the table is
 # still there.
 #
+set view_v1 {}
+ifcapable view {
+  set view_v1 {view v1}
+}
 do_test trigger-6.1 {
   execsql {SELECT type, name FROM sqlite_master}
-} [concat [ifcapable view {list view v1}] {table t2}]
+} [concat $view_v1 {table t2}]
 do_test trigger-6.2 {
   execsql {
     CREATE TRIGGER t2 BEFORE DELETE ON t2 BEGIN
@@ -330,7 +334,7 @@ do_test trigger-6.2 {
     END;
     SELECT type, name FROM sqlite_master;
   }
-} [concat [ifcapable view {list view v1}] {table t2 trigger t2}]
+} [concat $view_v1 {table t2 trigger t2}]
 do_test trigger-6.3 {
   catchsql {DELETE FROM t2}
 } {1 {deletes are not allows}}
@@ -341,13 +345,13 @@ do_test trigger-6.5 {
   db close
   sqlite3 db test.db
   execsql {SELECT type, name FROM sqlite_master}
-} [concat [ifcapable view {list view v1}] {table t2 trigger t2}]
+} [concat $view_v1 {table t2 trigger t2}]
 do_test trigger-6.6 {
   execsql {
     DROP TRIGGER t2;
     SELECT type, name FROM sqlite_master;
   }
-} [concat [ifcapable view {list view v1}] {table t2}]
+} [concat $view_v1 {table t2}]
 do_test trigger-6.7 {
   execsql {SELECT * FROM t2}
 } {3 4 7 8}