Index: third_party/sqlite/src/test/capi3.test |
diff --git a/third_party/sqlite/src/test/capi3.test b/third_party/sqlite/src/test/capi3.test |
index 0111dba4f38590d0199ae9aa17e973ef9a65796c..cc1461a7eefd2a63183bee297f1419570938697a 100644 |
--- a/third_party/sqlite/src/test/capi3.test |
+++ b/third_party/sqlite/src/test/capi3.test |
@@ -17,6 +17,11 @@ |
set testdir [file dirname $argv0] |
source $testdir/tester.tcl |
+# Do not use a codec for tests in this file, as the database file is |
+# manipulated directly using tcl scripts (using the [hexio_write] command). |
+# |
+do_not_use_codec |
+ |
# Return the UTF-16 representation of the supplied UTF-8 string $str. |
# If $nt is true, append two 0x00 bytes as a nul terminator. |
proc utf16 {str {nt 1}} { |
@@ -635,7 +640,7 @@ db close |
do_test capi3-6.0 { |
sqlite3 db test.db |
set DB [sqlite3_connection_pointer db] |
- sqlite3_key $DB xyzzy |
+ if {[sqlite3 -has-codec]==0} { sqlite3_key $DB xyzzy } |
set sql {SELECT a FROM t1 order by rowid} |
set STMT [sqlite3_prepare $DB $sql -1 TAIL] |
expr 0 |
@@ -646,11 +651,11 @@ do_test capi3-6.1 { |
} {SQLITE_BUSY} |
do_test capi3-6.2 { |
sqlite3_step $STMT |
-} {SQLITE_ROW} |
-check_data $STMT capi3-6.3 {INTEGER} {1} {1.0} {1} |
+} {SQLITE_ERROR} |
+#check_data $STMT capi3-6.3 {INTEGER} {1} {1.0} {1} |
do_test capi3-6.3 { |
sqlite3_finalize $STMT |
-} {SQLITE_OK} |
+} {SQLITE_SCHEMA} |
do_test capi3-6.4-misuse { |
db cache flush |
sqlite3_close $DB |
@@ -680,7 +685,7 @@ if {![sqlite3 -has-codec]} { |
set_file_format 5 |
} {} |
do_test capi3-7.2 { |
- sqlite3 db test.db |
+ catch { sqlite3 db test.db } |
catchsql { |
SELECT * FROM sqlite_master; |
} |
@@ -708,7 +713,7 @@ if {![sqlite3 -has-codec]} { |
db close |
} {} |
do_test capi3-8.3 { |
- sqlite3 db test.db |
+ catch { sqlite3 db test.db } |
catchsql { |
SELECT * FROM sqlite_master; |
} |
@@ -727,7 +732,7 @@ if {![sqlite3 -has-codec]} { |
db close |
} {}; |
do_test capi3-8.5 { |
- sqlite3 db test.db |
+ catch { sqlite3 db test.db } |
catchsql { |
SELECT * FROM sqlite_master; |
} |