Add the SQLITE_DEFAULT_DEFENSIVE compile-time option. Fix up test cases

so that they work with DEFENSIVE enabled.
flame4 · Nov 7, 2018 · 84a7f10 · 84a7f10
1 parent a929f1f
commit 84a7f10
Show file tree

Hide file tree

Showing 109 changed files with 42 additions and 102 deletions.
diff --git a/ext/fts5/test/fts5connect.test b/ext/fts5/test/fts5connect.test
@@ -244,4 +244,3 @@ foreach {tn sql res} {
 }
 
 finish_test
-
diff --git a/ext/fts5/test/fts5first.test b/ext/fts5/test/fts5first.test
@@ -93,4 +93,3 @@ do_catchsql_test 3.3 {
   SELECT * FROM x2('^a');
 } {1 {fts5: phrase queries are not supported (detail!=full)}}
 finish_test
-
diff --git a/ext/fts5/test/fts5rank.test b/ext/fts5/test/fts5rank.test
@@ -163,4 +163,3 @@ do_execsql_test 5.1 {
 } {30 31 32 33 34 35 36 37 38 39 40}
 
 finish_test
-
diff --git a/ext/fts5/test/fts5rebuild.test b/ext/fts5/test/fts5rebuild.test
@@ -43,7 +43,6 @@ sqlite3_db_config db DEFENSIVE 0
 do_execsql_test 1.5 {
   DELETE FROM f1_data;
 } {}
-sqlite3_db_config db DEFENSIVE 1
 
 do_catchsql_test 1.6 {
   INSERT INTO f1(f1) VALUES('integrity-check');

diff --git a/ext/fts5/test/fts5rowid.test b/ext/fts5/test/fts5rowid.test
@@ -75,7 +75,6 @@ do_execsql_test 2.4 {
   UPDATE x1_data SET block = X'';
   SELECT count(fts5_decode(rowid, block)) FROM x1_data;
 } $res
-sqlite3_db_config db DEFENSIVE 1
 
 do_execsql_test 2.5 {
   INSERT INTO x1(x1, rank) VALUES('pgsz', 1024);

diff --git a/ext/fts5/test/fts5vocab2.test b/ext/fts5/test/fts5vocab2.test
@@ -206,4 +206,3 @@ do_execsql_test 3.5 {
 }
 
 finish_test
-
diff --git a/ext/rbu/rbu1.test b/ext/rbu/rbu1.test
@@ -670,4 +670,3 @@ foreach {tn3 create_vfs destroy_vfs} {
 
 
 finish_test
-
diff --git a/ext/rbu/rbu10.test b/ext/rbu/rbu10.test
@@ -185,4 +185,3 @@ do_test 4.3 {
 
 
 finish_test
-
diff --git a/ext/rbu/rbu11.test b/ext/rbu/rbu11.test
@@ -195,4 +195,3 @@ do_test 4.7.2 {
 } {1 {SQLITE_ERROR - rbu_state mismatch error}}
 
 finish_test
-
diff --git a/ext/rbu/rbu12.test b/ext/rbu/rbu12.test
@@ -232,4 +232,3 @@ do_multiclient_test tn {
 }
 
 finish_test
-
diff --git a/ext/rbu/rbu13.test b/ext/rbu/rbu13.test
@@ -62,4 +62,3 @@ do_execsql_test 1.4 {
 
 
 finish_test
-
diff --git a/ext/rbu/rbu14.test b/ext/rbu/rbu14.test
@@ -92,4 +92,3 @@ foreach {tn schema} {
 
 
 finish_test
-
diff --git a/ext/rbu/rbu3.test b/ext/rbu/rbu3.test
@@ -203,5 +203,3 @@ do_test 5.3 {
 do_test 6.1 { sqlite3rbu_internal_test } {}
 
 finish_test
-
-
diff --git a/ext/rbu/rbu5.test b/ext/rbu/rbu5.test
@@ -300,7 +300,3 @@ foreach {tn idx} {
 
 
 finish_test
-
-
-
-
diff --git a/ext/rbu/rbu6.test b/ext/rbu/rbu6.test
@@ -100,4 +100,3 @@ for {set nStep 8} {$nStep < 20} {incr nStep} {
 
 
 finish_test
-
diff --git a/ext/rbu/rbu7.test b/ext/rbu/rbu7.test
@@ -106,5 +106,3 @@ foreach {tn tbl} {
 }
 
 finish_test
-
-
diff --git a/ext/rbu/rbu8.test b/ext/rbu/rbu8.test
@@ -72,4 +72,3 @@ integrity_check 1.3.3
 
 
 finish_test
-
diff --git a/ext/rbu/rbu9.test b/ext/rbu/rbu9.test
@@ -125,4 +125,3 @@ foreach {tn idx} {
 
 
 finish_test
-
diff --git a/ext/rbu/rbuA.test b/ext/rbu/rbuA.test
@@ -80,4 +80,3 @@ do_test 2.2 {
 
 
 finish_test
-
diff --git a/ext/rbu/rbuB.test b/ext/rbu/rbuB.test
@@ -59,4 +59,3 @@ sqlite3_shutdown
 test_sqlite3_log 
 sqlite3_initialize
 finish_test
-
diff --git a/ext/rbu/rbuC.test b/ext/rbu/rbuC.test
@@ -139,4 +139,3 @@ foreach {tn schema} {
 
 
 finish_test
-
diff --git a/ext/rbu/rbucollate.test b/ext/rbu/rbucollate.test
@@ -60,4 +60,3 @@ do_test 1.2 {
 
 #forcedelete testrbu.db
 finish_test
-
diff --git a/ext/rbu/rbucrash.test b/ext/rbu/rbucrash.test
@@ -145,4 +145,3 @@ for {set nPre 0} {$nPre < $rbu_num_steps} {incr nPre} {
 }
 
 finish_test
-
diff --git a/ext/rbu/rbucrash2.test b/ext/rbu/rbucrash2.test
@@ -103,4 +103,3 @@ for {set x 1} {$x < 2} {incr x} {
 }
 
 finish_test
-
diff --git a/ext/rbu/rbudiff.test b/ext/rbu/rbudiff.test
@@ -300,4 +300,3 @@ tablE t1 USING FTs5(c);
 
 
 finish_test
-
diff --git a/ext/rbu/rbudor.test b/ext/rbu/rbudor.test
@@ -56,4 +56,3 @@ do_execsql_test 1.4 {
 } [list 1 $bigA 2 $bigB]
 
 finish_test
-
diff --git a/ext/rbu/rbufault.test b/ext/rbu/rbufault.test
@@ -234,4 +234,3 @@ foreach {tn2 setup sql expect} {
 }
 
 finish_test
-
diff --git a/ext/rbu/rbufault2.test b/ext/rbu/rbufault2.test
@@ -55,4 +55,3 @@ do_faultsim_test 1 -faults oom* -prep {
 
 
 finish_test
-
diff --git a/ext/rbu/rbufault3.test b/ext/rbu/rbufault3.test
@@ -95,4 +95,3 @@ foreach {fault errlist} {
 }
 
 finish_test
-
diff --git a/ext/rbu/rbufault4.test b/ext/rbu/rbufault4.test
@@ -63,4 +63,3 @@ for {set tn 1} {1} {incr tn} {
 
 
 finish_test
-
diff --git a/ext/rbu/rbufts.test b/ext/rbu/rbufts.test
@@ -131,4 +131,3 @@ do_test 3.3 {
 
 
 finish_test
-
diff --git a/ext/rbu/rbumulti.test b/ext/rbu/rbumulti.test
@@ -172,4 +172,3 @@ for {set i 0} {$i<=3} {incr i} {
 
 
 finish_test
-
diff --git a/ext/rbu/rbuprogress.test b/ext/rbu/rbuprogress.test
@@ -416,4 +416,3 @@ foreach {bReopen} { 0 1 } {
 
 
 finish_test
-
diff --git a/ext/rbu/rburesume.test b/ext/rbu/rburesume.test
@@ -251,4 +251,3 @@ for {set n 1} {$n < 5000} {incr n} {
 }
 
 finish_test
-
diff --git a/ext/rbu/rbusave.test b/ext/rbu/rbusave.test
@@ -102,4 +102,3 @@ do_execsql_test 1.5 {
 } {1 one 1 3 3 3 4 4 4 1 one 1 3 3 3 4 4 4}
 
 finish_test
-
diff --git a/ext/rbu/rbusplit.test b/ext/rbu/rbusplit.test
@@ -92,4 +92,3 @@ foreach {tn cmd} {
 }
 
 finish_test
-
diff --git a/ext/rbu/rbutemplimit.test b/ext/rbu/rbutemplimit.test
@@ -126,4 +126,3 @@ do_test 1.6.1 {
 do_test 1.6.2 { info commands rbu } {}
 
 finish_test
-
diff --git a/ext/rbu/rbuvacuum.test b/ext/rbu/rbuvacuum.test
@@ -397,4 +397,3 @@ do_test 3.5 {
 
 catch { db close }
 finish_test
-
diff --git a/ext/rbu/rbuvacuum2.test b/ext/rbu/rbuvacuum2.test
@@ -232,4 +232,3 @@ do_test 6.3 {
 } {ok}
 
 finish_test
-
diff --git a/ext/repair/test/checkindex01.test b/ext/repair/test/checkindex01.test
@@ -347,5 +347,3 @@ do_index_check_test 7.3 t7i3 {
 do_index_check_test 7.4 t7i4 {
   {} 1,1 {} 3,3
 }
-
-
diff --git a/ext/rtree/rtree8.test b/ext/rtree/rtree8.test
@@ -103,7 +103,6 @@ populate_t1 50
 do_execsql_test rtree8-2.1.1 { SELECT max(nodeno) FROM t1_node } {5}
 sqlite3_db_config db DEFENSIVE 0
 do_execsql_test rtree8-2.1.2 { DELETE FROM t1_node } {}
-sqlite3_db_config db DEFENSIVE 1
 for {set i 1} {$i <= 50} {incr i} {
   do_catchsql_test rtree8-2.1.3.$i { 
     SELECT * FROM t1 WHERE id = $i 
@@ -127,7 +126,6 @@ sqlite3_db_config db DEFENSIVE 0
 do_execsql_test rtree8-2.2.1 {
   DELETE FROM t1_parent
 } {}
-sqlite3_db_config db DEFENSIVE 1
 do_catchsql_test rtree8-2.2.2 {
   DELETE FROM t1 WHERE id=25
 } {1 {database disk image is malformed}}

diff --git a/ext/session/sessionC.test b/ext/session/sessionC.test
@@ -195,4 +195,3 @@ do_test 3.3 {
 
 
 finish_test
-
diff --git a/ext/session/sessionD.test b/ext/session/sessionD.test
@@ -255,4 +255,3 @@ do_catchsql_test 4.5.2 {
 } {1 {no such table: ixua.i8}}
 
 finish_test
-
diff --git a/ext/session/sessionE.test b/ext/session/sessionE.test
@@ -111,5 +111,3 @@ do_changeset_test 3.4 S {
 S delete
 
 finish_test
-
-
diff --git a/ext/session/sessionF.test b/ext/session/sessionF.test
@@ -292,4 +292,3 @@ foreach {tn setup1 sql1 setup2 sql2 result} {
 
 
 finish_test
-
diff --git a/ext/session/sessionG.test b/ext/session/sessionG.test
@@ -248,4 +248,3 @@ do_execsql_test 6.4 {
 
 
 finish_test
-
diff --git a/ext/session/sessionH.test b/ext/session/sessionH.test
@@ -36,4 +36,3 @@ do_test 1.0 {
 
 
 finish_test
-
diff --git a/ext/session/sessionfault2.test b/ext/session/sessionfault2.test
@@ -282,4 +282,3 @@ do_faultsim_test 3.2 -faults oom* -prep {
 
 
 finish_test
-
diff --git a/ext/session/sessionrebase.test b/ext/session/sessionrebase.test
@@ -474,4 +474,3 @@ foreach {tn cmd rebasable} {
   catch { R delete }
 }
 finish_test
-
diff --git a/ext/session/sessionstat1.test b/ext/session/sessionstat1.test
@@ -308,4 +308,3 @@ do_test 4.2.3 {
 } {t3 null 3}
 
 finish_test
-
diff --git a/ext/session/sessionwor.test b/ext/session/sessionwor.test
@@ -54,4 +54,3 @@ do_iterator_test 1.3 t1 {
 }
 
 finish_test
-
diff --git a/src/main.c b/src/main.c
@@ -3062,6 +3062,9 @@ static int openDatabase(
 #endif
 #if defined(SQLITE_ENABLE_QPSG)
                  | SQLITE_EnableQPSG
+#endif
+#if defined(SQLITE_DEFAULT_DEFENSIVE)
+                 | SQLITE_Defensive
 #endif
       ;
   sqlite3HashInit(&db->aCollSeq);

diff --git a/test/alter2.test b/test/alter2.test
@@ -64,6 +64,7 @@ proc alter_table {tbl sql {file_format 2}} {
   sqlite3 dbat test.db
   set s [string map {' ''} $sql]
   set t [string map {' ''} $tbl]
+  sqlite3_db_config dbat DEFENSIVE 0
   dbat eval [subst {
     PRAGMA writable_schema = 1;
     UPDATE sqlite_master SET sql = '$s' WHERE name = '$t' AND type = 'table';
@@ -91,6 +92,7 @@ do_test alter2-1.0 {
 #-----------------------------------------------------------------------
 # Some basic tests to make sure short rows are handled.
 #
+sqlite3_db_config db DEFENSIVE 0
 do_test alter2-1.1 {
   execsql {
     CREATE TABLE abc(a, b);

diff --git a/test/altercol.test b/test/altercol.test
@@ -553,6 +553,7 @@ do_execsql_test 13.1.3 {
   SELECT sql FROM sqlite_master WHERE name='x1i';
 } {{CREATE INDEX x1i ON x1(i)}}
 
+sqlite3_db_config db DEFENSIVE 0
 do_execsql_test 13.1.4 {
   PRAGMA writable_schema = 1;
   UPDATE sqlite_master SET sql = 'CREATE INDEX x1i ON x1(j)' WHERE name='x1i';

diff --git a/test/alterlegacy.test b/test/alterlegacy.test
@@ -467,4 +467,3 @@ do_execsql_test 14.6 {
 
 
 finish_test
-
diff --git a/test/altertab.test b/test/altertab.test
@@ -505,4 +505,3 @@ do_execsql_test 15.5 {
 
 
 finish_test
-
diff --git a/test/altertab2.test b/test/altertab2.test
@@ -43,4 +43,3 @@ ifcapable fts5 {
 
 
 finish_test
-
diff --git a/test/analyze.test b/test/analyze.test
@@ -350,6 +350,7 @@ ifcapable stat4||stat3 {
 # in the series.
 #
 do_test analyze-5.99 {
+  sqlite3_db_config db DEFENSIVE 0
   execsql {
     PRAGMA writable_schema=on;
     UPDATE sqlite_master SET sql='nonsense' WHERE name='sqlite_stat1';

diff --git a/test/autoinc.test b/test/autoinc.test
@@ -697,6 +697,7 @@ do_test autoinc-12.1 {
   db close
   forcedelete test.db
   sqlite3 db test.db
+  sqlite3_db_config db DEFENSIVE 0
   db eval {
     CREATE TABLE fake_sequence(name TEXT PRIMARY KEY,seq) WITHOUT ROWID;
     PRAGMA writable_schema=on;
@@ -718,6 +719,7 @@ do_test autoinc-12.2 {
   db close
   forcedelete test.db
   sqlite3 db test.db
+  sqlite3_db_config db DEFENSIVE 0
   db eval {
    CREATE TABLE t1(a INTEGER PRIMARY KEY AUTOINCREMENT, b TEXT);
    INSERT INTO t1(b) VALUES('one');
@@ -744,6 +746,7 @@ do_test autoinc-12.3 {
   db close
   forcedelete test.db
   sqlite3 db test.db
+  sqlite3_db_config db DEFENSIVE 0
   db eval {
    CREATE TABLE t1(a INTEGER PRIMARY KEY AUTOINCREMENT, b TEXT);
    INSERT INTO t1(b) VALUES('one');
@@ -772,6 +775,7 @@ do_test autoinc-12.4 {
                      WHERE name='sqlite_sequence'}]
   set root2 [db one {SELECT rootpage FROM sqlite_master
                      WHERE name='fake'}]
+  sqlite3_db_config db DEFENSIVE 0
   db eval {
    PRAGMA writable_schema=on;
    UPDATE sqlite_master SET rootpage=$root2
@@ -791,6 +795,7 @@ do_test autoinc-12.5 {
   db close
   forcedelete test.db
   sqlite3 db test.db
+  sqlite3_db_config db DEFENSIVE 0
   db eval {
     CREATE TABLE t1(a INTEGER PRIMARY KEY AUTOINCREMENT, b TEXT);
     INSERT INTO t1(b) VALUES('one');
@@ -810,6 +815,7 @@ do_test autoinc-12.6 {
   db close
   forcedelete test.db
   sqlite3 db test.db
+  sqlite3_db_config db DEFENSIVE 0
   db eval {
     CREATE TABLE t1(a INTEGER PRIMARY KEY AUTOINCREMENT, b TEXT);
     INSERT INTO t1(b) VALUES('one');
@@ -831,6 +837,7 @@ do_test autoinc-12.7 {
   db close
   forcedelete test.db
   sqlite3 db test.db
+  sqlite3_db_config db DEFENSIVE 0
   db eval {
     CREATE TABLE t1(a INTEGER PRIMARY KEY AUTOINCREMENT, b TEXT);
     INSERT INTO t1(b) VALUES('one');

diff --git a/test/bestindex5.test b/test/bestindex5.test
@@ -247,4 +247,3 @@ do_execsql_test 3.5 { SELECT rowid, * FROM t4 WHERE rowid!=1 OR x!='245'; } {}
 
 
 finish_test
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -244,4 +244,3 @@ foreach {tn sql res} {
		}

		finish_test
Original file line number	Diff line number	Diff line change
Expand Up		@@ -93,4 +93,3 @@ do_catchsql_test 3.3 {
		SELECT * FROM x2('^a');
		} {1 {fts5: phrase queries are not supported (detail!=full)}}
		finish_test
Original file line number	Diff line number	Diff line change
Expand Up		@@ -163,4 +163,3 @@ do_execsql_test 5.1 {
		} {30 31 32 33 34 35 36 37 38 39 40}

		finish_test
Original file line number	Diff line number	Diff line change
Expand Up		@@ -206,4 +206,3 @@ do_execsql_test 3.5 {
		}

		finish_test
Original file line number	Diff line number	Diff line change
Expand Up		@@ -670,4 +670,3 @@ foreach {tn3 create_vfs destroy_vfs} {


		finish_test
Original file line number	Diff line number	Diff line change
Expand Up		@@ -195,4 +195,3 @@ do_test 4.7.2 {
		} {1 {SQLITE_ERROR - rbu_state mismatch error}}

		finish_test
Original file line number	Diff line number	Diff line change
Expand Up		@@ -232,4 +232,3 @@ do_multiclient_test tn {
		}

		finish_test
Original file line number	Diff line number	Diff line change
Expand Up		@@ -203,5 +203,3 @@ do_test 5.3 {
		do_test 6.1 { sqlite3rbu_internal_test } {}

		finish_test
Original file line number	Diff line number	Diff line change
Expand Up		@@ -100,4 +100,3 @@ for {set nStep 8} {$nStep < 20} {incr nStep} {


		finish_test
Original file line number	Diff line number	Diff line change
Expand Up		@@ -59,4 +59,3 @@ sqlite3_shutdown
		test_sqlite3_log
		sqlite3_initialize
		finish_test