Merge two "wal"

leaves.

FossilOrigin-Name: 13d2d5a66e9eaa81aa6314354201ee1fbd2b3824
This commit is contained in:
dan
2010-04-28 17:49:57 +00:00
9 changed files with 89 additions and 83 deletions
+1 -1
View File
@@ -35,7 +35,7 @@ do_test tcl-1.1 {
do_test tcl-1.2 {
set v [catch {db bogus} msg]
lappend v $msg
} {1 {bad option "bogus": must be authorizer, backup, busy, cache, changes, close, collate, collation_needed, commit_hook, complete, copy, enable_load_extension, errorcode, eval, exists, function, incrblob, interrupt, last_insert_rowid, log_hook, nullvalue, onecolumn, profile, progress, rekey, restore, rollback_hook, status, timeout, total_changes, trace, transaction, unlock_notify, update_hook, or version}}
} {1 {bad option "bogus": must be authorizer, backup, busy, cache, changes, close, collate, collation_needed, commit_hook, complete, copy, enable_load_extension, errorcode, eval, exists, function, incrblob, interrupt, last_insert_rowid, nullvalue, onecolumn, profile, progress, rekey, restore, rollback_hook, status, timeout, total_changes, trace, transaction, unlock_notify, update_hook, version, or wal_hook}}
do_test tcl-1.2.1 {
set v [catch {db cache bogus} msg]
lappend v $msg
+10 -11
View File
@@ -25,31 +25,31 @@ proc sqlite3_wal {args} {
}
}
sqlite3_wal db test.db
db log_hook log_hook
db wal_hook wal_hook
set ::log_hook [list]
proc log_hook {zDb nEntry} {
lappend ::log_hook $zDb $nEntry
set ::wal_hook [list]
proc wal_hook {zDb nEntry} {
lappend ::wal_hook $zDb $nEntry
return 0
}
do_test walhook-1.1 {
execsql { CREATE TABLE t1(i PRIMARY KEY, j) }
set ::log_hook
set ::wal_hook
} {main 3}
do_test walhook-1.2 {
set ::log_hook [list]
set ::wal_hook [list]
execsql { INSERT INTO t1 VALUES(1, 'one') }
set ::log_hook
set ::wal_hook
} {main 5}
do_test walhook-1.3 {
proc log_hook {args} { return 1 }
proc wal_hook {args} { return 1 }
execsql { INSERT INTO t1 VALUES(2, 'two') }
file size test.db
} [expr 3*1024]
do_test walhook-1.4 {
proc log_hook {zDb nEntry} {
proc wal_hook {zDb nEntry} {
execsql { PRAGMA checkpoint }
return 0
}
@@ -59,7 +59,7 @@ do_test walhook-1.4 {
do_test walhook-1.5 {
sqlite3_wal db2 test.db
proc log_hook {zDb nEntry} {
proc wal_hook {zDb nEntry} {
execsql { PRAGMA checkpoint } db2
return 0
}
@@ -70,4 +70,3 @@ do_test walhook-1.5 {
catch { db2 close }
catch { db close }
finish_test