Disable trigger tests that use ATTACH in version 2.8 when there is a

codec enabled. (CVS 2042)

FossilOrigin-Name: f77f7753aaca0b4a147f91e538691cb4ee8995a8

diff --git a/manifest b/manifest
index e0b1134cc6c5ea3c62a4e0a3d8d5b69d22d63326..82cc6bc3000b6349d7f38f58a42d24c76a86b574 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\snaming\sconflict\sbetween\ssqlite.h\sand\ssqlite3.h.\s\sTicket\s#946.\s(CVS\s2008)
-D 2004-10-06T15:52:36
+C Disable\strigger\stests\sthat\suse\sATTACH\sin\sversion\s2.8\swhen\sthere\sis\sa\ncodec\senabled.\s(CVS\s2042)
+D 2004-11-02T18:30:44
 F Makefile.in ab7b0d5118e2da97bac66be8684a1034e3500f5a
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -140,7 +140,7 @@ F test/thread1.test 53f050d5be6932d9430df7756edd379366508ff6
 F test/threadtest1.c f7f896e62ed46feae1dc411114a48c15a0f82ee2
 F test/threadtest2.c d94ca4114fd1504f7e0ae724bcd83d4b40931d86
 F test/trans.test 0cb8256daff1ae0da75321e00125338c6681158d
-F test/trigger1.test cf8c8bbdaa254b000242f89e024f9b44cafda093
+F test/trigger1.test d2d38d8a81a2c4a033b27965aaf28a0b7aa99f31
 F test/trigger2.test 0767ab30cb5a2c8402c8524f3d566b410b6f5263
 F test/trigger3.test a95ccace88291449f5eae7139ec438a42f90654d
 F test/trigger4.test 542afce45774e8f8e1130b96b8675f414d6e4bd8
@@ -191,7 +191,7 @@ F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
 F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da
 F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P bf90799d889ccc88ed7e3635b041d5f38865d447
-R 731446fc336301ac5314c1821b01b726
+P e750ae5ab8ed9a2cd38548c63008cc7d2576e26d
+R cbfcc11c67e5bc3861ac7b7938e80e45
 U drh
-Z 153fbedcee98e896b4b2315ff1b1bfa6
+Z 0c1d91864077f6eee2c42fc7a7772b0e

diff --git a/manifest.uuid b/manifest.uuid
index 3e2d16065948e080e787967887264180f81e9d20..9854897819330421a1dd685e17eafda0ae89c607 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e750ae5ab8ed9a2cd38548c63008cc7d2576e26d
\ No newline at end of file
+f77f7753aaca0b4a147f91e538691cb4ee8995a8
\ No newline at end of file

diff --git a/test/trigger1.test b/test/trigger1.test
index d8d08dec7b13f65323eb6b46607d9d3ec9d5b999..c3c97029917a5104182c04a08d7848fd490e8ac2 100644 (file)
--- a/test/trigger1.test
+++ b/test/trigger1.test
@@ -418,6 +418,14 @@ execsql {
   DROP TABLE t4;
 }
 
+# Skip the remaining tests if we have a codec.  The ATTACH command
+# will not work right on these tests when there is a codec.
+#
+if {[sqlite -has-codec]} {
+  finish_test
+  return
+}
+
 # Ticket #764. At one stage TEMP triggers would fail to re-install when the
 # schema was reloaded. The following tests ensure that TEMP triggers are
 # correctly re-installed.