Fix compilation and testing when SQLITE_OMIT_TRIGGER is defined. Ticket #3786. (CVS...

FossilOrigin-Name: 277dace43d51fbc79c7a62fc841c150ecd8d0823

diff --git a/manifest b/manifest
index cc5e6828ae7a7b6b73551f4ad95aa77ef35970da..68ec2cbbf21f2bba0553c7499116af2fd22a7dcd 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Only\senable\sWHERE-tracing\swhen\sboth\sTEST\sand\sDEBUG\sare\senabled.\s(CVS\s6463)
-D 2009-04-07T13:48:12
+C Fix\scompilation\sand\stesting\swhen\sSQLITE_OMIT_TRIGGER\sis\sdefined.\sTicket\s#3786.\s(CVS\s6464)
+D 2009-04-07T14:14:22
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -159,7 +159,7 @@ F src/select.c 462d9671e91accd983110fa38674be0d2a3daa66
 F src/shell.c 0a11f831603f17fea20ca97133c0f64e716af4a7
 F src/sqlite.h.in 718a026b4cf3c766fc7ac5ff582faa60324b116c
 F src/sqlite3ext.h 1db7d63ab5de4b3e6b83dd03d1a4e64fef6d2a17
-F src/sqliteInt.h d1239060599bc45ed9e4668cb7759e6c433dd5ab
+F src/sqliteInt.h 3754c3c7f8549db259909882d3484250d77488cb
 F src/sqliteLimit.h ffe93f5a0c4e7bd13e70cd7bf84cfb5c3465f45d
 F src/status.c 237b193efae0cf6ac3f0817a208de6c6c6ef6d76
 F src/table.c 332ab0ea691e63862e2a8bdfe2c0617ee61062a3
@@ -214,7 +214,7 @@ F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/alias.test 597662c5d777a122f9a3df0047ea5c5bd383a911
 F test/all.test 14165b3e32715b700b5f0cbf8f6e3833dda0be45
 F test/alter.test 645b2e8d23c9936f9494af9d2fa7f8351a248c6e
-F test/alter2.test dd55146e812622c8fc51fd2216bcd8dca8880752
+F test/alter2.test d0133bfa7a0a24aa84c034051410b95217d24a35
 F test/alter3.test 25b95a136708f22b87184fa6a4309eea03d65153
 F test/alter4.test 9386ffd1e9c7245f43eca412b2058d747509cc1f
 F test/altermalloc.test e81ac9657ed25c6c5bb09bebfa5a047cd8e4acfc
@@ -234,7 +234,7 @@ F test/autovacuum.test 25f891bc343a8bf5d9229e2e9ddab9f31a9ab5ec
 F test/autovacuum_ioerr2.test 598b0663074d3673a9c1bc9a16e80971313bafe6
 F test/avtrans.test 1e901d8102706b63534dbd2bdd4d8f16c4082650
 F test/backup.test 5e487ec8dad73e9d249e9bb9ca5346a03b601b07
-F test/backup2.test 107e6e9adeb7f40e77ef46022c01b98a26b3bfef
+F test/backup2.test 159419073d9769fdb1780ed7e5b391a046f898d5
 F test/backup_ioerr.test a9b8084e488154341719833783ac9db321e14284
 F test/backup_malloc.test 1e063c6d75143d0d6e0ae77971dd690070369387
 F test/badutf.test d5360fc31f643d37a973ab0d8b4fb85799c3169f
@@ -385,7 +385,7 @@ F test/fuzz2.test ea38692ce2da99ad79fe0be5eb1a452c1c4d37bb
 F test/fuzz3.test aec64345184d1662bd30e6a17851ff659d596dc5
 F test/fuzz_common.tcl a87dfbb88c2a6b08a38e9a070dabd129e617b45b
 F test/fuzz_malloc.test 4eca9d345f06d5b0b0105f7a2ef9e7f22658827b
-F test/hook.test a9961ccfcf7271cd7fc72352de77aff822359e66
+F test/hook.test c9c992f2914977072a71e98df3bfcad1f47737c9
 F test/icu.test f51d0f4407ff8bb1e872f51a0e8b08fdc5a6897e
 F test/in.test d49419c6df515852f477fa513f3317181d46bc92
 F test/in2.test 5d4c61d17493c832f7d2d32bef785119e87bde75
@@ -557,7 +557,7 @@ F test/tableapi.test 505031f15b18a750184d967d2c896cf88fcc969c
 F test/tclsqlite.test 8b1150d0486c4848c70d96422513a91c5342be0e
 F test/tempdb.test b88ac8a19823cf771d742bf61eef93ef337c06b1
 F test/temptable.test 5d8ca46be28cc06c887c5a77df650843b7edbae1
-F test/temptrigger.test 03093be9967942623232dfdf2a63b832d4e0e4fa
+F test/temptrigger.test 8fc2ce469590465f85b8cc4176e0fe4595b3bf62
 F test/tester.tcl 9bdc35fac11b0a75cae3f91e527098ba879dbfc2
 F test/thread001.test a3e6a7254d1cb057836cb3145b60c10bf5b7e60f
 F test/thread002.test afd20095e6e845b405df4f2c920cb93301ca69db
@@ -597,11 +597,11 @@ F test/tkt2565.test de9673c9e3affbf9574c0727556c5140cb9c53a4
 F test/tkt2640.test 28134f5d1e05658ef182520cf0b680fa3de5211b
 F test/tkt2643.test 3f3ebb743da00d4fed4fcf6daed92a0e18e57813
 F test/tkt2686.test 08f0f584461bc4990376936daa0a9bd3e6e81671
-F test/tkt2767.test 2607e36e5577c699221b964e7bbc06dd794dd738
+F test/tkt2767.test 569000d842678f9cf2db7e0d1b27cbc9011381b0
 F test/tkt2817.test 94646b604c7dbae7058782f6582c05e200700aa9
 F test/tkt2820.test 017fdee33aaef7abc092beab6088816f1942304b
 F test/tkt2822.test a2b27a58df62d1b2e712f91dbe42ad3b7e0e77cc
-F test/tkt2832.test 85cf382ff406de9de35534b86bc7227d609140c0
+F test/tkt2832.test a9b0b74a02dca166a04d9e37739c414b10929caa
 F test/tkt2854.test b81dc3144901b123fe5674471adf5a47ca48a7c3
 F test/tkt2920.test a8737380e4ae6424e00c0273dc12775704efbebf
 F test/tkt2927.test 4752868b9eeeb07a217f7f19f4cbaac98d6d086d
@@ -611,7 +611,7 @@ F test/tkt3093.test fbdbc5b4969244ad11f540759003e361fcaf391f
 F test/tkt3121.test 536df66a02838c26a12fe98639354ca1290ca68b
 F test/tkt3201.test 607d433ad2c1f6a8cb1af55aaca427f63c83191b
 F test/tkt3292.test 962465a0984a3b8c757efe59c2c59144871ee1dd
-F test/tkt3298.test a735582095ca2e90a0c1391c7e781a90de6c1f34
+F test/tkt3298.test 20fd8773b825cb602e033aa04f8602e1ebdcd93c
 F test/tkt3334.test ea13a53cb176e90571a76c86605b14a09efe366d
 F test/tkt3346.test 6f67c3ed7db94dfc5df4f5f0b63809a1f611e01a
 F test/tkt3357.test b37a51a12ba5e143d6714778276438606f8f9e27
@@ -637,7 +637,7 @@ F test/tkt3761.test b95ea9c98f21cf91325f18a984887e62caceab33
 F test/tkt3762.test 2a9f3b03df44ec49ec0cfa8d5da6574c2a7853df
 F test/tkt3773.test 430b06567ce40285dfd2c4834a2a61816403efeb
 F test/tokenize.test ce430a7aed48fc98301611429595883fdfcab5d7
-F test/trace.test 951cd0f5f571e7f36bf7bfe04be70f90fb16fb00
+F test/trace.test 19ffbc09885c3321d56358a5738feae8587fb377
 F test/trans.test 8b79967a7e085289ec64890c6fdf9d089e1b4a5f
 F test/trans2.test d5337e61de45e66b1fcbf9db833fa8c82e624b22
 F test/trans3.test d728abaa318ca364dc370e06576aa7e5fbed7e97
@@ -675,7 +675,7 @@ F test/vtab8.test e19fa4a538fcd1bb66c22825fa8f71618fb13583
 F test/vtab9.test ea58d2b95d61955f87226381716b2d0b1d4e4f9b
 F test/vtabA.test 0dcd4c81ffb56649f47d1b5fb9c5ae807ccf41f7
 F test/vtabB.test 04df5dc531b9f44d9ca65b9c1b79f12b5922a796
-F test/vtabC.test 9f2d9eb84bf65e606d6616f20977c5a32a11f548
+F test/vtabC.test 1cf7896ab6859bfe3074244b2b0e12de5cbdd766
 F test/vtab_alter.test 3a299749fee97ca3d53bd55717f536e4a2284856
 F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
 F test/vtab_shared.test c19b2555b807ef2ee014c882cdda5bc8d84fcf48
@@ -715,7 +715,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 6f79e6ae0d30948db4ba26bb5b448c15c470464f
-R b86f85689a47c05a3e942ac3182e5355
-U drh
-Z cf27c4815f0d4b057a9dd07cd290f024
+P 55b93649258204797f56a58322cf31b564469633
+R 4fa93a7b88ebb3ef1e8c16f682b0f343
+U danielk1977
+Z 3aac3520d9a453008b701269679795d2

diff --git a/manifest.uuid b/manifest.uuid
index 23eeee91354ed362fd4438ac47d16823e9e575ff..96c4dff2d56210c2c1088f52834c39269bcebd55 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-55b93649258204797f56a58322cf31b564469633
\ No newline at end of file
+277dace43d51fbc79c7a62fc841c150ecd8d0823
\ No newline at end of file

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 4eed2559f9565aec2ded9c8b2bc307aab9122270..625c2e1ffb76733ed6d6e83aa3c4302ff6833620 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -11,7 +11,7 @@
 *************************************************************************
 ** Internal interface definitions for SQLite.
 **
-** @(#) $Id: sqliteInt.h,v 1.851 2009/04/05 12:22:09 drh Exp $
+** @(#) $Id: sqliteInt.h,v 1.852 2009/04/07 14:14:22 danielk1977 Exp $
 */
 #ifndef _SQLITEINT_H_
 #define _SQLITEINT_H_
@@ -2537,6 +2537,7 @@ void sqlite3MaterializeView(Parse*, Table*, Expr*, int);
 # define sqlite3DropTriggerPtr(A,B)
 # define sqlite3UnlinkAndDeleteTrigger(A,B,C)
 # define sqlite3CodeRowTrigger(A,B,C,D,E,F,G,H,I,J,K,L) 0
+# define sqlite3TriggerList(X, Y) 0
 #endif
 
 int sqlite3JoinType(Parse*, Token*, Token*, Token*);

diff --git a/test/alter2.test b/test/alter2.test
index e56c976c247ec5d2dd8fb8e296d989d718d78f2f..0ce023b8fdcb069b9abf400da295dcdb777fa455 100644 (file)
--- a/test/alter2.test
+++ b/test/alter2.test
@@ -13,7 +13,7 @@
 # file format change that may be used in the future to implement
 # "ALTER TABLE ... ADD COLUMN".
 #
-# $Id: alter2.test,v 1.13 2008/03/19 00:21:31 drh Exp $
+# $Id: alter2.test,v 1.14 2009/04/07 14:14:22 danielk1977 Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -220,6 +220,8 @@ ifcapable trigger {
       SELECT * FROM clog;
     }
   } {{} 2 {} 6 {} 10}
+} else {
+  execsql { CREATE TABLE abc3(a, b); }
 }
 
 #---------------------------------------------------------------------
@@ -276,9 +278,7 @@ ifcapable vacuum {
     get_file_format
   } {2}
   do_test alter2-5.2 {
-    execsql {    
-      VACUUM;
-    }
+    execsql { VACUUM }
   } {}
   do_test alter2-5.3 {
     get_file_format

diff --git a/test/backup2.test b/test/backup2.test
index 5c2dfa19435e0b61dcd0c9e5743a49607116e755..17b5f6de19cab82eaccd754e2988d5d4db13360e 100644 (file)
--- a/test/backup2.test
+++ b/test/backup2.test
@@ -13,11 +13,13 @@
 # of the TCL interface - methods which are based on the
 # sqlite3_backup_XXX API.
 #
-# $Id: backup2.test,v 1.3 2009/03/18 13:55:30 danielk1977 Exp $
+# $Id: backup2.test,v 1.4 2009/04/07 14:14:23 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
+ifcapable !trigger||!view { finish_test ; return }
+
 # Fill a database with test data.
 #
 do_test backup2-1 {

diff --git a/test/hook.test b/test/hook.test
index 33eeefc704bae0b7c2bb973a7ac5f46bbbabf07e..b526708e0d49028d2b50926db58f94989753910f 100644 (file)
--- a/test/hook.test
+++ b/test/hook.test
@@ -17,7 +17,7 @@
 #      sqlite_update_hook    (tests hook-4-*)
 #      sqlite_rollback_hook  (tests hook-5.*)
 #
-# $Id: hook.test,v 1.14 2009/01/03 14:04:39 drh Exp $
+# $Id: hook.test,v 1.15 2009/04/07 14:14:23 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -158,26 +158,25 @@ do_test hook-4.1.2 {
     DELETE main t1 4 \
 ]
 
-# Update hook is not invoked for changes to sqlite_master
-#
-do_test hook-4.1.3 {
-  set ::update_hook {}
-  execsql {
-    CREATE TRIGGER r1 AFTER INSERT ON t1 BEGIN SELECT RAISE(IGNORE); END;
-  }
-  set ::update_hook
-} {}
-do_test hook-4.1.4 {
-  set ::update_hook {}
-  execsql {
-    DROP TRIGGER r1;
-  }
-  set ::update_hook
-} {}
-
-
-set ::update_hook {}
 ifcapable trigger {
+  # Update hook is not invoked for changes to sqlite_master
+  #
+  do_test hook-4.1.3 {
+    set ::update_hook {}
+    execsql {
+      CREATE TRIGGER r1 AFTER INSERT ON t1 BEGIN SELECT RAISE(IGNORE); END;
+    }
+    set ::update_hook
+  } {}
+  do_test hook-4.1.4 {
+    set ::update_hook {}
+    execsql {
+      DROP TRIGGER r1;
+    }
+    set ::update_hook
+  } {}
+  
+  set ::update_hook {}
   do_test hook-4.2.1 {
     catchsql {
       DROP TABLE t2;

diff --git a/test/temptrigger.test b/test/temptrigger.test
index 9d0d797476a157646f7e15eb945da9d7874ea6ef..a8d4e0c93eb945e9d6cb7bec9e1db244b1e5c1f2 100644 (file)
--- a/test/temptrigger.test
+++ b/test/temptrigger.test
@@ -9,11 +9,13 @@
 #
 #***********************************************************************
 #
-# $Id: temptrigger.test,v 1.1 2009/02/28 10:47:42 danielk1977 Exp $
+# $Id: temptrigger.test,v 1.2 2009/04/07 14:14:23 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
+ifcapable !trigger { finish_test ; return }
+
 # Test cases:
 #
 #   temptrigger-1.*: Shared cache problem.

diff --git a/test/tkt2767.test b/test/tkt2767.test
index 6d642b41ba91a671724bcab1edab78ac2fba3de4..29b520146d46d200f223afc99c8f43da6c390436 100644 (file)
--- a/test/tkt2767.test
+++ b/test/tkt2767.test
@@ -13,12 +13,14 @@
 # Ticket #2767 is for a VDBE stack overflow on BEFORE
 # triggers that run RAISE(IGNORE).
 #
-# $Id: tkt2767.test,v 1.2 2008/07/12 14:52:21 drh Exp $
+# $Id: tkt2767.test,v 1.3 2009/04/07 14:14:23 danielk1977 Exp $
 #
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
+ifcapable !trigger { finish_test ; return }
+
 do_test tkt2767-1.1 {
   execsql {
     -- Construct a table with many rows of data

diff --git a/test/tkt2832.test b/test/tkt2832.test
index 6a98a7b6c0edf7594206e42851788f5e51515e1e..f9986990069b34aa8343466122c386f44b141442 100644 (file)
--- a/test/tkt2832.test
+++ b/test/tkt2832.test
@@ -11,12 +11,14 @@
 #
 # This file is to test that ticket #2832 has been fixed.
 #
-# $Id: tkt2832.test,v 1.4 2008/07/12 14:52:21 drh Exp $
+# $Id: tkt2832.test,v 1.5 2009/04/07 14:14:23 danielk1977 Exp $
 #
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
+ifcapable !trigger { finish_test ; return }
+
 do_test tkt2832-1.1 {
   execsql {
     CREATE TABLE t1(a PRIMARY KEY);

diff --git a/test/tkt3298.test b/test/tkt3298.test
index c94c4669da716442d2d08275f4cd1e85b474e4f9..0e546f7e696411c2c37103a37f05dfbd39fc2d52 100644 (file)
--- a/test/tkt3298.test
+++ b/test/tkt3298.test
@@ -12,11 +12,13 @@
 # This file tests changes to the name resolution logic that occurred
 # in august of 2008 and where associated with tickets #3298 and #3301
 #
-# $Id: tkt3298.test,v 1.2 2008/08/22 12:46:46 drh Exp $
+# $Id: tkt3298.test,v 1.3 2009/04/07 14:14:23 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
+ifcapable !trigger { finish_test ; return }
+
 do_test tkt3298-1.1 {
   execsql {
     CREATE TABLE t1(a INTEGER PRIMARY KEY, b INT);

diff --git a/test/trace.test b/test/trace.test
index 67ad0e3786c9182bfee701ce1bfeae57f20914da..762c1d738bf3e0419176e4ca5e30aa4080005b27 100644 (file)
--- a/test/trace.test
+++ b/test/trace.test
@@ -12,7 +12,7 @@
 #
 # This file implements tests for the "sqlite3_trace()" API.
 #
-# $Id: trace.test,v 1.7 2008/01/12 21:35:57 drh Exp $
+# $Id: trace.test,v 1.8 2009/04/07 14:14:23 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -147,23 +147,25 @@ catch {sqlite3_finalize $STMT}
 
 # Trigger tracing.
 #
-do_test trace-5.1 {
-  db eval {
-    CREATE TRIGGER r1t1 AFTER UPDATE ON t1 BEGIN
-      UPDATE t2 SET a=new.a WHERE rowid=new.rowid;
-    END;
-    CREATE TRIGGER r1t2 AFTER UPDATE ON t2 BEGIN
-      SELECT 'hello';
-    END;
-  }
-  set TRACE_OUT {}
-  proc trace_proc cmd {
-    lappend ::TRACE_OUT [string trim $cmd]
-  }
-  db eval {
-    UPDATE t1 SET a=a+1;
-  }
-  set TRACE_OUT
-} {{UPDATE t1 SET a=a+1;} {-- TRIGGER r1t1} {-- TRIGGER r1t2} {-- TRIGGER r1t1} {-- TRIGGER r1t2} {-- TRIGGER r1t1} {-- TRIGGER r1t2}}
+ifcapable trigger {
+  do_test trace-5.1 {
+    db eval {
+      CREATE TRIGGER r1t1 AFTER UPDATE ON t1 BEGIN
+        UPDATE t2 SET a=new.a WHERE rowid=new.rowid;
+      END;
+      CREATE TRIGGER r1t2 AFTER UPDATE ON t2 BEGIN
+        SELECT 'hello';
+      END;
+    }
+    set TRACE_OUT {}
+    proc trace_proc cmd {
+      lappend ::TRACE_OUT [string trim $cmd]
+    }
+    db eval {
+      UPDATE t1 SET a=a+1;
+    }
+    set TRACE_OUT
+  } {{UPDATE t1 SET a=a+1;} {-- TRIGGER r1t1} {-- TRIGGER r1t2} {-- TRIGGER r1t1} {-- TRIGGER r1t2} {-- TRIGGER r1t1} {-- TRIGGER r1t2}}
+}
 
 finish_test

diff --git a/test/vtabC.test b/test/vtabC.test
index 483974887c404ae6088ac5165e55dae4916328db..824d4ca242bf013e8383ec56dba63a8827d3f81f 100644 (file)
--- a/test/vtabC.test
+++ b/test/vtabC.test
@@ -13,7 +13,7 @@
 # and xRollback methods are only invoked after an xBegin or xCreate.
 # Ticket #3083.
 #
-# $Id: vtabC.test,v 1.1 2008/04/28 20:27:54 drh Exp $
+# $Id: vtabC.test,v 1.2 2009/04/07 14:14:23 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -23,6 +23,8 @@ ifcapable !vtab {
   return
 }
 
+ifcapable !trigger { finish_test ; return }
+
 
 # N will be the number of virtual tables we have defined.
 #