Add OOM tests for the recovery extension.

FossilOrigin-Name: 9b6b4c7162439a889144edb561356afc66436db921a867c20871f0c556716502

diff --git a/ext/recover/recover1.test b/ext/recover/recover1.test
index 3ee4c18ad6c0cdcc565d479aed7c1d3ceef0c41a..e7a45e8e905755445966de7dfdfbe4dbd982bced 100644 (file)
--- a/ext/recover/recover1.test
+++ b/ext/recover/recover1.test
@@ -167,6 +167,32 @@ ifcapable fts5 {
   do_recover_test 9 
 }
 
+#-------------------------------------------------------------------------
+reset_db
+do_execsql_test 10.1 {
+  CREATE TABLE x1(a PRIMARY KEY, str TEXT) WITHOUT ROWID;
+  INSERT INTO x1 VALUES(1, '
+    \nhello\012world(\n0)(\n1)
+  ');
+  INSERT INTO x1 VALUES(2, '
+    \nhello
+  ');
+}
+do_execsql_test 10.2 "
+  INSERT INTO x1 VALUES(3, '\012hello there\015world');
+  INSERT INTO x1 VALUES(4, '\015hello there\015world');
+"
+do_recover_test 10 
+
+#-------------------------------------------------------------------------
+reset_db
+do_execsql_test 11.1 {
+  PRAGMA encoding='utf16';
+  CREATE TABLE u1(u, v);
+  INSERT INTO u1 VALUES('edvin marton', 'bond');
+  INSERT INTO u1 VALUES(1, 4.0);
+}
+do_recover_test 11 
 
 
 

diff --git a/ext/recover/recoverfault2.test b/ext/recover/recoverfault2.test
new file mode 100644 (file)
index 0000000..7489206
--- /dev/null
+++ b/ext/recover/recoverfault2.test
@@ -0,0 +1,108 @@
+# 2022 August 28
+#
+# 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.
+#
+#***********************************************************************
+#
+
+if {![info exists testdir]} {
+  set testdir [file join [file dirname [info script]] .. .. test]
+} 
+source [file join [file dirname [info script]] recover_common.tcl]
+source $testdir/tester.tcl
+
+set testprefix recoverfault2
+
+
+#--------------------------------------------------------------------------
+proc compare_result {db1 db2 sql} {
+  set r1 [$db1 eval $sql]
+  set r2 [$db2 eval $sql]
+  if {$r1 != $r2} {
+    puts "r1: $r1"
+    puts "r2: $r2"
+    error "mismatch for $sql"
+  }
+  return ""
+}
+
+proc compare_dbs {db1 db2} {
+  compare_result $db1 $db2 "SELECT sql FROM sqlite_master ORDER BY 1"
+  foreach tbl [$db1 eval {SELECT name FROM sqlite_master WHERE type='table'}] {
+    compare_result $db1 $db2 "SELECT * FROM $tbl"
+  }
+}
+#--------------------------------------------------------------------------
+
+do_execsql_test 1.0 "
+  CREATE TABLE t1(a INTEGER PRIMARY KEY, b);
+  INSERT INTO t1 VALUES(2, '\012hello\015world\012today\n');
+"
+faultsim_save_and_close
+
+proc my_sql_hook {sql} {
+  lappend ::lSql $sql
+  return 0
+}
+
+do_faultsim_test 1 -faults oom* -prep {
+  catch { db2 close }
+  faultsim_restore_and_reopen
+  set ::lSql [list]
+} -body {
+  set R [sqlite3_recover_init_sql db main my_sql_hook]
+  $R run
+  $R finish
+} -test {
+  faultsim_test_result {0 {}} {1 {}}
+  if {$testrc==0} {
+    sqlite3 db2 ""
+    db2 eval [join $::lSql ";"]
+    compare_dbs db db2
+    db2 close
+  }
+}
+
+ifcapable utf16 {
+  reset_db
+  do_execsql_test 2.0 "
+    PRAGMA encoding='utf-16';
+    CREATE TABLE t1(a INTEGER PRIMARY KEY, b);
+    INSERT INTO t1 VALUES(2, '\012hello\015world\012today\n');
+  "
+  faultsim_save_and_close
+  
+  proc my_sql_hook {sql} {
+  puts "HOOK $sql"
+    lappend ::lSql $sql
+    return 0
+  }
+  
+  do_faultsim_test 2 -faults oom-t* -prep {
+    catch { db2 close }
+    faultsim_restore_and_reopen
+    set ::lSql [list]
+  } -body {
+    set R [sqlite3_recover_init_sql db main my_sql_hook]
+    $R run
+    $R finish
+  } -test {
+    faultsim_test_result {0 {}} {1 {}}
+    if {$testrc==0} {
+      sqlite3 db2 ""
+      db2 eval [join $::lSql ";"]
+      compare_dbs db db2
+      db2 close
+    }
+  }
+}
+
+
+
+finish_test
+

diff --git a/manifest b/manifest
index 954e80712a4af168b5de2748264a6d8595906445..18c614dd009f7482f6725ef6f21f156d3642d08b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sbroken\serror\shandling\scase\sin\sthe\srecovery\sextension.
-D 2022-09-13T19:47:01.338
+C Add\sOOM\stests\sfor\sthe\srecovery\sextension.
+D 2022-09-13T20:40:57.096
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -387,11 +387,12 @@ F ext/rbu/rbuvacuum4.test a78898e438a44803eb2bc897ba3323373c9f277418e2d6d76e90f2
 F ext/rbu/sqlite3rbu.c 8737cabdfbee84bb25a7851ecef8b1312be332761238da9be6ddb10c62ad4291
 F ext/rbu/sqlite3rbu.h 1dc88ab7bd32d0f15890ea08d23476c4198d3da3056985403991f8c9cd389812
 F ext/rbu/test_rbu.c 03f6f177096a5f822d68d8e4069ad8907fe572c62ff2d19b141f59742821828a
-F ext/recover/recover1.test d0fa2f945aac4754e0abb802941b9b80efd4828a775a090f9d2253f5a0ee1d0e
+F ext/recover/recover1.test 623afa77b91996bb1319b069ced5245c243caa995f66793d6879fbc2c190f0be
 F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007aceffafca75304ccb137c
 F ext/recover/recoverclobber.test 294dcc894124ab4ca3a7b35766630742a3d25810fceac22220beb64f70a33a60
 F ext/recover/recovercorrupt.test e3f3cbe0162ba681518aac9ea0ae8119f32ac93fb0900b5f09b6318966108e54
 F ext/recover/recoverfault.test f3587c218c448545a082b99d59294dff5ec0b7daa15b0556cf926f6c350f221e
+F ext/recover/recoverfault2.test 699b3ec07ba6982291e65e1811807f18d7f115234b407c819eaf3529878867f5
 F ext/recover/recoverold.test 46e9d99b595fac583d4c67f74d7d89c20a435c752ef6eeb3e918b599940c88e0
 F ext/recover/recoverrowid.test 1694a1a5526d825f71279f3d02ab02a1ee4c5265de18858bf54cb8ec54487ac8
 F ext/recover/recoversql.test f9872ff2114e13ffd8ee31e1de06919f62b9b48bc080191b5bd076d10becb60f
@@ -2010,8 +2011,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 4e97dd31f5240d9231167ae172a5116426c42177a1ed3c5422b9d51b762d5a87
-R bab9a5e0534df0c970f1689fb0655c4b
+P 60089547e1fc77ecc02f207ebf75ee3160e5ff25f41d12e02e170fd7fde66602
+R 4e62121f5a47cd1728b6e036c3f3c8c0
 U dan
-Z ca04715ddf53f08e8c8270238268a615
+Z 5fc633ab904798afb52a452a7e949f53
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index d9dc13270c91a236e5040d694c30a3f36db2c738..2c3276310dbd1e0dd5d4f736837cd96e4ddd6aac 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-60089547e1fc77ecc02f207ebf75ee3160e5ff25f41d12e02e170fd7fde66602
\ No newline at end of file
+9b6b4c7162439a889144edb561356afc66436db921a867c20871f0c556716502
\ No newline at end of file