From: dan <dan@noemail.net>
Date: Fri, 13 Mar 2015 15:44:36 +0000 (+0000)
Subject: Add tests to ensure "PRAGMA incremental_vacuum" and "PRAGMA auto_vacuum = incremental... 
X-Git-Tag: version-3.8.9~77
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dfac7016a7b95ed1b65bd62ea1e6dfbb48ab7d54;p=thirdparty%2Fsqlite.git

Add tests to ensure "PRAGMA incremental_vacuum" and "PRAGMA auto_vacuum = incremental" handle corrupt databases correctly.

FossilOrigin-Name: 1c2166cb2a387a0856f41b399c3648bf8c5fce73
---

diff --git a/manifest b/manifest
index fd821ade74..e1d464f1a0 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Extra\stests\sfor\scommit\s[0f250957].
-D 2015-03-13T08:31:54.154
+C Add\stests\sto\sensure\s"PRAGMA\sincremental_vacuum"\sand\s"PRAGMA\sauto_vacuum\s=\sincremental"\shandle\scorrupt\sdatabases\scorrectly.
+D 2015-03-13T15:44:36.085
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 88a3e6261286db378fdffa1124cad11b3c05f5bb
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -646,6 +646,7 @@ F test/incrblob3.test d8d036fde015d4a159cd3cbae9d29003b37227a4
 F test/incrblob4.test f26502a5697893e5acea268c910f16478c2f0fab
 F test/incrblob_err.test af1f12ba60d220c9752073ff2bda2ad59e88960d
 F test/incrblobfault.test 280474078f6da9e732cd2a215d3d854969014b6e
+F test/incrcorrupt.test 9786cba68c5832f01887fde1c06b43c3904d86f6
 F test/incrvacuum.test d2a6ddf5e429720b5fe502766af747915ccf6c32
 F test/incrvacuum2.test 676c41428765d58f1da7dbe659ef27726d3d30ac
 F test/incrvacuum3.test 75256fb1377e7c39ef2de62bfc42bbff67be295a
@@ -1243,7 +1244,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 2887fb38ffc28712c34028cd38db2b7993d864eb
-R b89c9ce97b230db0ae63022a487b40cc
+P 5aa522dcb9bfa18d49683f7cc889516984e2bcd2
+R a79445283a8ae7c7f85ae571d23bc239
 U dan
-Z ccca41f9c448bc442b12b8c9fe5620ec
+Z d6c136b9ed1be16533c60706d0427e82
diff --git a/manifest.uuid b/manifest.uuid
index f5b9305905..e474b58d5e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5aa522dcb9bfa18d49683f7cc889516984e2bcd2
\ No newline at end of file
+1c2166cb2a387a0856f41b399c3648bf8c5fce73
\ No newline at end of file
diff --git a/test/incrcorrupt.test b/test/incrcorrupt.test
new file mode 100644
index 0000000000..eda65e4035
--- /dev/null
+++ b/test/incrcorrupt.test
@@ -0,0 +1,127 @@
+# 2001 October 12
+#
+# 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 that "PRAGMA incremental_vacuum" detects and reports database
+# corruption properly. And that "PRAGMA auto_vacuum = INCREMENTAL"
+# does as well.
+#
+
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+set testprefix incrcorrupt
+
+# If this build of the library does not support auto-vacuum, omit this
+# whole file.
+ifcapable {!autovacuum} {
+  finish_test
+  return
+}
+
+do_execsql_test 1.0 {
+  PRAGMA auto_vacuum = 2;
+  CREATE TABLE t1(a PRIMARY KEY, b);
+
+  WITH data(i) AS (
+    SELECT 1 UNION ALL SELECT i+1 FROM data
+  )
+  INSERT INTO t1 SELECT i, randomblob(600) FROM data LIMIT 20;
+  PRAGMA page_count;
+} {24}
+
+do_execsql_test 1.1 {
+  PRAGMA incremental_vacuum;
+} {}
+
+do_test 1.2 {
+  db_save
+  hexio_write test.db 36 00000019
+  catchsql { PRAGMA incremental_vacuum; }
+} {1 {database disk image is malformed}}
+
+do_test 1.3 {
+  set stmt [sqlite3_prepare_v2 db "PRAGMA incremental_vacuum" -1 dummy]
+  sqlite3_step $stmt
+} {SQLITE_CORRUPT}
+do_test 1.4 { sqlite3_errcode db } {SQLITE_CORRUPT}
+do_test 1.5 { sqlite3_errmsg db } {database disk image is malformed}
+do_test 1.6 { sqlite3_finalize $stmt } {SQLITE_CORRUPT}
+do_test 1.7 { sqlite3_errcode db } {SQLITE_CORRUPT}
+do_test 1.8 { sqlite3_errmsg db } {database disk image is malformed}
+
+do_test 1.9 {
+  set stmt [sqlite3_prepare_v2 db "PRAGMA incremental_vacuum" -1 dummy]
+  sqlite3_step $stmt
+} {SQLITE_CORRUPT}
+do_test 1.10 { sqlite3_errcode db } {SQLITE_CORRUPT}
+do_test 1.11 { sqlite3_errmsg db } {database disk image is malformed}
+
+do_test 1.12 {
+  set stmt2 [sqlite3_prepare_v2 db "SELECT 1" -1 dummy]
+  sqlite3_finalize $stmt2
+} {SQLITE_OK}
+do_test 1.13 { sqlite3_errcode db } {SQLITE_OK}
+do_test 1.14 { sqlite3_errmsg db } {not an error}
+
+do_test 1.15 { sqlite3_finalize $stmt } {SQLITE_CORRUPT}
+do_test 1.16 { sqlite3_errcode db } {SQLITE_CORRUPT}
+do_test 1.17 { sqlite3_errmsg db } {database disk image is malformed}
+
+#-------------------------------------------------------------------------
+#
+reset_db
+
+do_execsql_test 2.1 {
+  PRAGMA auto_vacuum = 1;
+  CREATE TABLE t1(a PRIMARY KEY, b);
+  WITH data(i) AS (
+    SELECT 1 UNION ALL SELECT i+1 FROM data
+  )
+  INSERT INTO t1 SELECT i, randomblob(600) FROM data LIMIT 20;
+  PRAGMA page_count;
+} {24}
+
+do_test 2.2 {
+  db_save
+  set fd [open test.db r+]
+  chan truncate $fd [expr 22*1024]
+  close $fd
+  catchsql { PRAGMA incremental_vacuum; }
+} {1 {database disk image is malformed}}
+
+do_test 2.3 {
+  set stmt [sqlite3_prepare_v2 db "PRAGMA auto_vacuum = INCREMENTAL" -1 dummy]
+  sqlite3_step $stmt
+} {SQLITE_CORRUPT}
+do_test 2.4 { sqlite3_errcode db } {SQLITE_CORRUPT}
+do_test 2.5 { sqlite3_errmsg db } {database disk image is malformed}
+do_test 2.6 { sqlite3_finalize $stmt } {SQLITE_CORRUPT}
+do_test 2.7 { sqlite3_errcode db } {SQLITE_CORRUPT}
+do_test 2.8 { sqlite3_errmsg db } {database disk image is malformed}
+
+do_test 2.9 {
+  set stmt [sqlite3_prepare_v2 db "PRAGMA auto_vacuum = INCREMENTAL" -1 dummy]
+  sqlite3_step $stmt
+} {SQLITE_CORRUPT}
+do_test 2.10 { sqlite3_errcode db } {SQLITE_CORRUPT}
+do_test 2.11 { sqlite3_errmsg db } {database disk image is malformed}
+
+do_test 2.12 {
+  set stmt2 [sqlite3_prepare_v2 db "SELECT 1" -1 dummy]
+  sqlite3_finalize $stmt2
+} {SQLITE_OK}
+do_test 2.13 { sqlite3_errcode db } {SQLITE_OK}
+do_test 2.14 { sqlite3_errmsg db } {not an error}
+
+do_test 2.15 { sqlite3_finalize $stmt } {SQLITE_CORRUPT}
+do_test 2.16 { sqlite3_errcode db } {SQLITE_CORRUPT}
+do_test 2.17 { sqlite3_errmsg db } {database disk image is malformed}
+
+finish_test
+