Merge tag 'upstream/2.2.1'

Upstream version 2.2.1
# gpg: Signature made Tue 13 Aug 2013 03:42:56 PM EDT using RSA key ID 374BBE81
# gpg: Good signature from "Hans-Christoph Steiner <hans@at.or.at>"
# gpg:                 aka "[jpeg image of size 5408]"
# gpg:                 aka "Hans-Christoph Steiner <hs420@nyu.edu>"
# gpg:                 aka "Hans-Christoph Steiner <hans@eds.org>"
# gpg:                 aka "Hans-Christoph Steiner <hans@guardianproject.info>"
# gpg:                 aka "Hans-Christoph Steiner <hansi@nyu.edu>"
# gpg:                 aka "Hans-Christoph Steiner <hans@guardianproject.info>"

1 files changed, 79 insertions, 0 deletions

diff --git a/test/close.test b/test/close.test
new file mode 100644
index 0000000..355a886
--- /dev/null
+++ b/test/close.test
@@ -0,0 +1,79 @@
+# 2013 May 14
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#***********************************************************************
+#
+# Test some specific circumstances to do with shared cache mode.
+#
+
+
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+set ::testprefix close
+
+do_execsql_test 1.0 {
+  CREATE TABLE t1(x);
+  INSERT INTO t1 VALUES('one');
+  INSERT INTO t1 VALUES('two');
+  INSERT INTO t1 VALUES('three');
+}
+db close
+
+do_test 1.1 {
+  set DB [sqlite3_open test.db]
+  sqlite3_close_v2 $DB
+} {SQLITE_OK}
+
+do_test 1.2.1 {
+  set DB [sqlite3_open test.db]
+  set STMT [sqlite3_prepare $DB "SELECT * FROM t1" -1 dummy]
+  sqlite3_close_v2 $DB
+} {SQLITE_OK}
+do_test 1.2.2 {
+  sqlite3_finalize $STMT
+} {SQLITE_OK}
+
+do_test 1.3.1 {
+  set DB [sqlite3_open test.db]
+  set STMT [sqlite3_prepare $DB "SELECT * FROM t1" -1 dummy]
+  sqlite3_step $STMT
+  sqlite3_close_v2 $DB
+} {SQLITE_OK}
+
+do_test 1.3.2 {
+  sqlite3_column_text $STMT 0
+} {one}
+
+do_test 1.3.3 {
+  sqlite3_finalize $STMT
+} {SQLITE_OK}
+
+do_test 1.4.1 {
+  set DB [sqlite3_open test.db]
+  set STMT [sqlite3_prepare $DB "SELECT * FROM t1" -1 dummy]
+  sqlite3_step $STMT
+  sqlite3_close_v2 $DB
+} {SQLITE_OK}
+
+do_test 1.4.2 {
+  list [sqlite3_step $STMT] [sqlite3_column_text $STMT 0]
+} {SQLITE_ROW two}
+
+do_test 1.4.3 {
+  list [catch {
+    sqlite3_prepare $DB "SELECT * FROM sqlite_master" -1 dummy
+  } msg] $msg
+} {1 {(21) library routine called out of sequence}}
+
+do_test 1.4.4 {
+  sqlite3_finalize $STMT
+} {SQLITE_OK}
+
+finish_test
+