diff options
| author | mdm@chromium.org <mdm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-18 18:27:25 +0000 |
|---|---|---|
| committer | mdm@chromium.org <mdm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-18 18:27:25 +0000 |
| commit | 997e22224e1062a4cd39373057a68879a1d7a3ac (patch) | |
| tree | a90a9ce4272fc78f2459b1b2c78b52a3f6d4e5d3 /third_party/sqlite/test/incrblob2.test | |
| parent | 0d683c611a18dc6ea0e99f38c73b4fb96611041f (diff) | |
| download | chromium_src-997e22224e1062a4cd39373057a68879a1d7a3ac.zip chromium_src-997e22224e1062a4cd39373057a68879a1d7a3ac.tar.gz chromium_src-997e22224e1062a4cd39373057a68879a1d7a3ac.tar.bz2 | |
Update sqlite to version 3.6.18, porting our patches.
Hopefully this will help to address some valgrind issues.
BUG=none
TEST=none
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26596 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/sqlite/test/incrblob2.test')
| -rw-r--r-- | third_party/sqlite/test/incrblob2.test | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/third_party/sqlite/test/incrblob2.test b/third_party/sqlite/test/incrblob2.test index 90295e8..9046de2 100644 --- a/third_party/sqlite/test/incrblob2.test +++ b/third_party/sqlite/test/incrblob2.test @@ -12,7 +12,7 @@ # Test that it is possible to have two open blob handles on a single # blob object. # -# $Id: incrblob2.test,v 1.8 2008/06/28 15:33:26 danielk1977 Exp $ +# $Id: incrblob2.test,v 1.11 2009/06/29 06:00:37 danielk1977 Exp $ # set testdir [file dirname $argv0] @@ -265,7 +265,7 @@ ifcapable shared_cache { do_test incrblob2-5.3 { set blob [db incrblob t1 data 1] catchsql { INSERT INTO t1 VALUES(3, 'klmno') } db2 - } {1 {database is locked}} + } {1 {database table is locked}} do_test incrblob2-5.4 { close $blob @@ -274,15 +274,24 @@ ifcapable shared_cache { } {0 {}} do_test incrblob2-5.5 { - set blob [db incrblob -readonly t1 data 1] - catchsql { INSERT INTO t1 VALUES(5, 'uvwxy') } db2 - } {1 {database table is locked}} + set rc [catch { db incrblob -readonly t1 data 1 } msg] + list $rc $msg + } {1 {database table is locked: t1}} do_test incrblob2-5.6 { - close $blob + execsql { PRAGMA read_uncommitted=1 } + set blob [db incrblob -readonly t1 data 4] + read $blob + } {pqrst} + + do_test incrblob2-5.7 { catchsql { INSERT INTO t1 VALUES(3, 'klmno') } db2 } {0 {}} + do_test incrblob2-5.8 { + close $blob + } {} + db2 close db close sqlite3_enable_shared_cache $::enable_shared_cache @@ -363,7 +372,7 @@ do_test incrblob2-8.1 { execsql BEGIN set h [db incrblob t2 B 1] set rc [catch { - db eval {SELECT * FROM t2} { execsql "DROP TABLE t2" } + db eval {SELECT rowid FROM t2} { execsql "DROP TABLE t2" } } msg] list $rc $msg } {1 {database table is locked}} |