Merge the experimental UNDELETABLE_WHEN_OPEN optimization into the trunk.

FossilOrigin-Name: ee0acef1faffd480fd2136f81fb2b6f6a17b5388

1 files changed, 16 insertions, 15 deletions

diff --git a/test/walmode.test b/test/walmode.test
index 714e0d818..48979b19c 100644
--- a/test/walmode.test
+++ b/test/walmode.test
@@ -124,46 +124,48 @@ do_test walmode-4.5 {
 # from WAL to rollback mode because a second connection has the database
 # open. Or from rollback to WAL.
 #
-do_test walmode-4.1 {
+do_test walmode-4.6 {
   sqlite3 db2 test.db
   execsql { PRAGMA main.journal_mode } db2
 } {delete}
-do_test walmode-4.2 {
+do_test walmode-4.7 {
   execsql { PRAGMA main.journal_mode = wal } db
 } {wal}
-do_test walmode-4.3 {
+do_test walmode-4.8 {
   execsql { SELECT * FROM t1 } db2
 } {1 2}
-do_test walmode-4.4 {
+do_test walmode-4.9 {
   catchsql { PRAGMA journal_mode = delete } db
 } {1 {database is locked}}
-do_test walmode-4.5 {
+do_test walmode-4.10 {
   execsql { PRAGMA main.journal_mode } db
 } {wal}
-do_test walmode-4.6 {
+
+do_test walmode-4.11 {
   db2 close
   execsql { PRAGMA journal_mode = delete } db
 } {delete}
-do_test walmode-4.7 {
+do_test walmode-4.12 {
   execsql { PRAGMA main.journal_mode } db
 } {delete}
-do_test walmode-4.8 {
+do_test walmode-4.13 {
   list [file exists test.db-journal] [file exists test.db-wal]
 } {0 0}
-do_test walmode-4.9 {
+do_test walmode-4.14 {
   sqlite3 db2 test.db
   execsql {
     BEGIN;
       SELECT * FROM t1;
   } db2
 } {1 2}
-do_test walmode-4.11 {
-  execsql { PRAGMA main.journal_mode } db
-} {delete}
-do_test walmode-4.10 {
+
+do_test walmode-4.16 { execsql { PRAGMA main.journal_mode } db  } {delete}
+do_test walmode-4.17 { execsql { PRAGMA main.journal_mode } db2 } {delete}
+
+do_test walmode-4.17 {
   catchsql { PRAGMA main.journal_mode = wal } db
 } {1 {database is locked}}
-do_test walmode-4.11 {
+do_test walmode-4.18 {
   execsql { PRAGMA main.journal_mode } db
 } {delete}
 catch { db close }
@@ -180,7 +182,6 @@ do_test walmode-5.1.1 {
   sqlite3 db :memory:
   execsql { PRAGMA main.journal_mode }
 } {memory}
-breakpoint
 do_test walmode-5.1.2 {
   execsql { PRAGMA main.journal_mode = wal }
 } {memory}