| Index: third_party/sqlite/src/test/incrblob.test
|
| diff --git a/third_party/sqlite/src/test/incrblob.test b/third_party/sqlite/src/test/incrblob.test
|
| index 9c9389eb4c4bd450907afd96818aeed2784ace48..4277e5c4c1a29452843ef250dc245b039e4bf059 100644
|
| --- a/third_party/sqlite/src/test/incrblob.test
|
| +++ b/third_party/sqlite/src/test/incrblob.test
|
| @@ -120,9 +120,10 @@ foreach AutoVacuumMode [list 0 1] {
|
| }
|
|
|
| db close
|
| - file delete -force test.db test.db-journal
|
| + forcedelete test.db test.db-journal
|
|
|
| sqlite3 db test.db
|
| + execsql "PRAGMA mmap_size = 0"
|
| execsql "PRAGMA auto_vacuum = $AutoVacuumMode"
|
|
|
| do_test incrblob-2.$AutoVacuumMode.1 {
|
| @@ -149,6 +150,7 @@ foreach AutoVacuumMode [list 0 1] {
|
| # Open and close the db to make sure the page cache is empty.
|
| db close
|
| sqlite3 db test.db
|
| + execsql "PRAGMA mmap_size = 0"
|
|
|
| # Read the last 20 bytes of the blob via a blob handle.
|
| set ::blob [db incrblob blobs v 1]
|
| @@ -171,6 +173,7 @@ foreach AutoVacuumMode [list 0 1] {
|
| # Open and close the db to make sure the page cache is empty.
|
| db close
|
| sqlite3 db test.db
|
| + execsql "PRAGMA mmap_size = 0"
|
|
|
| # Write the second-to-last 20 bytes of the blob via a blob handle.
|
| #
|
| @@ -200,6 +203,7 @@ foreach AutoVacuumMode [list 0 1] {
|
| # Open and close the db to make sure the page cache is empty.
|
| db close
|
| sqlite3 db test.db
|
| + execsql { PRAGMA mmap_size = 0 }
|
|
|
| execsql { SELECT i FROM blobs }
|
| } {45}
|
| @@ -379,7 +383,7 @@ ifcapable vtab {
|
| #
|
| ifcapable attach {
|
| do_test incrblob-5.1 {
|
| - file delete -force test2.db test2.db-journal
|
| + forcedelete test2.db test2.db-journal
|
| set ::size [expr [file size [info script]]]
|
| execsql {
|
| ATTACH 'test2.db' AS aux;
|
| @@ -437,7 +441,7 @@ if {[permutation] != "memsubsys1"} {
|
| } {}
|
| do_test incrblob-6.2 {
|
| execsql {
|
| - SELECT rowid FROM blobs
|
| + SELECT rowid FROM blobs ORDER BY rowid
|
| }
|
| } {1 2 3}
|
| do_test incrblob-6.3 {
|
| @@ -473,15 +477,9 @@ if {[permutation] != "memsubsys1"} {
|
| flush $::blob
|
| } {}
|
|
|
| - # At this point rollback should be illegal (because
|
| - # there is an open blob channel). But commit is also illegal because
|
| - # the open blob is read-write.
|
| + # At this point commit should be illegal (because
|
| + # there is an open blob channel).
|
| #
|
| - do_test incrblob-6.10 {
|
| - catchsql {
|
| - ROLLBACK;
|
| - } db2
|
| - } {1 {cannot rollback transaction - SQL statements in progress}}
|
| do_test incrblob-6.11 {
|
| catchsql {
|
| COMMIT;
|
| @@ -511,7 +509,7 @@ if {[permutation] != "memsubsys1"} {
|
| sqlite3_soft_heap_limit $cmdlinearg(soft-heap-limit)
|
|
|
| #-----------------------------------------------------------------------
|
| -# The following tests verify the behaviour of the incremental IO
|
| +# The following tests verify the behavior of the incremental IO
|
| # APIs in the following cases:
|
| #
|
| # 7.1 A row that containing an open blob is modified.
|
| @@ -522,7 +520,7 @@ sqlite3_soft_heap_limit $cmdlinearg(soft-heap-limit)
|
| # 7.3 An INCREMENTAL VACUUM moves an overflow page that is part
|
| # of an open blob.
|
| #
|
| -# In the first case above, correct behaviour is for all subsequent
|
| +# In the first case above, correct behavior is for all subsequent
|
| # read/write operations on the blob-handle to return SQLITE_ABORT.
|
| # More accurately, blob-handles are invalidated whenever the table
|
| # they belong to is written to.
|
| @@ -584,7 +582,7 @@ set ::data [read $fd 14000]
|
| close $fd
|
|
|
| db close
|
| -file delete -force test.db test.db-journal
|
| +forcedelete test.db test.db-journal
|
| sqlite3 db test.db
|
|
|
| do_test incrblob-7.2.1 {
|
|
|