database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-12 13:01:09 +03:00
Code Activity

If a call to sqlite3_snapshot_open() fails because the requested snapshot no

Browse Source 
longer exists, return SQLITE_ERROR_SNAPSHOT instead of SQLITE_BUSY_SNAPSHOT.

FossilOrigin-Name: e07923128bb164efbafde29d49175b61f2ef44b2dfac5ae4ed61937945dfcf4c
This commit is contained in:
dan
2018-08-31 19:00:16 +00:00
parent 876c7ea3fa
commit 8d4b7a3fa8
9 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/snapshot.test
View File

@@ -258,7 +258,7 @@ foreach {tn tcl} {
} {}
#-------------------------------------------------------------------------
# Check that SQLITE_BUSY_SNAPSHOT is returned if the specified snapshot
# Check that SQLITE_ERROR_SNAPSHOT is returned if the specified snapshot
# no longer exists because the wal file has been checkpointed.
#
# 1. Reading a snapshot from the middle of a wal file is not possible
@@ -296,7 +296,7 @@ foreach {tn tcl} {
BEGIN;
}
list [catch {snapshot_open db main $snapshot} msg] $msg
} {1 SQLITE_BUSY_SNAPSHOT}
} {1 SQLITE_ERROR_SNAPSHOT}
do_test $tn.4.1.4 {
snapshot_free $snapshot
execsql COMMIT
@@ -327,7 +327,7 @@ foreach {tn tcl} {
BEGIN;
}
list [catch {snapshot_open db main $snapshot} msg] $msg
} {1 SQLITE_BUSY_SNAPSHOT}
} {1 SQLITE_ERROR_SNAPSHOT}
do_test $tn.4.2.4 {
snapshot_free $snapshot
} {}

6
test/snapshot2.test
View File

@@ -110,7 +110,7 @@ do_test 2.2 {
execsql {SELECT * FROM sqlite_master}
execsql BEGIN
list [catch { sqlite3_snapshot_open_blob db main $snap } msg] $msg
} {1 SQLITE_BUSY_SNAPSHOT}
} {1 SQLITE_ERROR_SNAPSHOT}
do_test 2.3 {
execsql COMMIT
@@ -134,7 +134,7 @@ do_test 2.5 {
sqlite3_snapshot_recover db main
execsql BEGIN
list [catch { sqlite3_snapshot_open_blob db main $snap } msg] $msg
} {1 SQLITE_BUSY_SNAPSHOT}
} {1 SQLITE_ERROR_SNAPSHOT}
#-------------------------------------------------------------------------
# Check that calling sqlite3_snapshot_recover() does not confuse the
@@ -234,7 +234,7 @@ do_test 5.4 {
execsql { INSERT INTO t2 VALUES('jkl') }
execsql BEGIN db2
list [catch { sqlite3_snapshot_open_blob db2 main $snap } msg] $msg
} {1 SQLITE_BUSY_SNAPSHOT}
} {1 SQLITE_ERROR_SNAPSHOT}
finish_test

2
test/snapshot3.test
View File

@@ -94,7 +94,7 @@ do_test 1.7 {
do_test 1.8 {
execsql BEGIN db3
list [catch { sqlite3_snapshot_open_blob db3 main $snap } msg] $msg
} {1 SQLITE_BUSY_SNAPSHOT}
} {1 SQLITE_ERROR_SNAPSHOT}
finish_test

8
test/snapshot_up.test
View File

@@ -75,7 +75,7 @@ do_execsql_test 1.6 {
do_test 1.7 {
list [catch { sqlite3_snapshot_open db main $::snap1 } msg] $msg
} {1 SQLITE_BUSY_SNAPSHOT}
} {1 SQLITE_ERROR_SNAPSHOT}
do_execsql_test 1.8 {
SELECT * FROM t1
@@ -84,7 +84,7 @@ do_execsql_test 1.8 {
do_test 1.9 {
execsql { COMMIT ; BEGIN }
list [catch { sqlite3_snapshot_open db main $::snap1 } msg] $msg
} {1 SQLITE_BUSY_SNAPSHOT}
} {1 SQLITE_ERROR_SNAPSHOT}
do_test 1.10 {
execsql { COMMIT }
@@ -113,7 +113,7 @@ do_test 1.12 {
do_test 1.13 {
list [catch { sqlite3_snapshot_open db main $::snap3 } msg] $msg
} {1 SQLITE_BUSY_SNAPSHOT}
} {1 SQLITE_ERROR_SNAPSHOT}
do_test 1.14 {
execsql { SELECT * FROM t1 }
} {4 5 6 7 8 9 10 11 12 13 14 15}
@@ -127,7 +127,7 @@ do_execsql_test 1.15 {
} {7 8 9 10 11 12 13 14 15}
do_test 1.16 {
list [catch { sqlite3_snapshot_open db main $::snap4 } msg] $msg
} {1 SQLITE_BUSY_SNAPSHOT}
} {1 SQLITE_ERROR_SNAPSHOT}
do_execsql_test 1.17 { COMMIT }
sqlite3_snapshot_free $::snap1