From: dan <Dan Kennedy>
Date: Tue, 27 Dec 2022 11:53:28 +0000 (+0000)
Subject: Fix minor problems in test scripts where.test and recover1.test.
X-Git-Tag: version-3.40.1~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dffd1dd294c71116f8375e1ca14cdd8ec92574c1;p=thirdparty%2Fsqlite.git

Fix minor problems in test scripts where.test and recover1.test.

FossilOrigin-Name: 64588bd5da228026da8d2ba679625f36802f19944e00db79c832884ef4e429cd
---

diff --git a/ext/recover/recover1.test b/ext/recover/recover1.test
index 3e8a691492..dba96f5198 100644
--- a/ext/recover/recover1.test
+++ b/ext/recover/recover1.test
@@ -275,44 +275,46 @@ do_recover_test 15
 
 #-------------------------------------------------------------------------
 reset_db
-do_execsql_test 16.1 {
-  PRAGMA journal_mode = wal;
-  CREATE TABLE t1(x);
-  INSERT INTO t1 VALUES(1), (2), (3);
-} {wal}
-do_test 16.2 {
-  set R [sqlite3_recover_init db main test.db2]
-  $R run
-  $R finish
-} {}
-do_execsql_test 16.3 {
-  SELECT * FROM t1;
-} {1 2 3}
-
-do_execsql_test 16.4 {
-  BEGIN;
+if {[wal_is_capable]} {
+  do_execsql_test 16.1 {
+    PRAGMA journal_mode = wal;
+    CREATE TABLE t1(x);
+    INSERT INTO t1 VALUES(1), (2), (3);
+  } {wal}
+  do_test 16.2 {
+    set R [sqlite3_recover_init db main test.db2]
+    $R run
+    $R finish
+  } {}
+  do_execsql_test 16.3 {
     SELECT * FROM t1;
-} {1 2 3}
-do_test 16.5 {
-  set R [sqlite3_recover_init db main test.db2]
-  $R run
-  list [catch { $R finish } msg] $msg
-} {1 {cannot start a transaction within a transaction}}
-do_execsql_test 16.6 {
-  SELECT * FROM t1;
-} {1 2 3}
-do_execsql_test 16.7 {
-  INSERT INTO t1 VALUES(4);
+  } {1 2 3}
+  
+  do_execsql_test 16.4 {
+    BEGIN;
+      SELECT * FROM t1;
+  } {1 2 3}
+  do_test 16.5 {
+    set R [sqlite3_recover_init db main test.db2]
+    $R run
+    list [catch { $R finish } msg] $msg
+  } {1 {cannot start a transaction within a transaction}}
+  do_execsql_test 16.6 {
+    SELECT * FROM t1;
+  } {1 2 3}
+  do_execsql_test 16.7 {
+    INSERT INTO t1 VALUES(4);
+  }
+  do_test 16.8 {
+    set R [sqlite3_recover_init db main test.db2]
+    $R run
+    list [catch { $R finish } msg] $msg
+  } {1 {cannot start a transaction within a transaction}}
+  do_execsql_test 16.9 {
+    SELECT * FROM t1;
+    COMMIT;
+  } {1 2 3 4}
 }
-do_test 16.8 {
-  set R [sqlite3_recover_init db main test.db2]
-  $R run
-  list [catch { $R finish } msg] $msg
-} {1 {cannot start a transaction within a transaction}}
-do_execsql_test 16.9 {
-  SELECT * FROM t1;
-  COMMIT;
-} {1 2 3 4}
 
 finish_test
 
diff --git a/manifest b/manifest
index 88543af082..0313b7f1fd 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\san\sunsafe\suse\sof\ssqlite3_mprintf()\sin\ssqlite3_overload_function()\sidentified\sby\sforum\spost:\s[https://sqlite.org/forum/forumpost/95b338860d].
-D 2022-12-26T17:09:43.392
+C Fix\sminor\sproblems\sin\stest\sscripts\swhere.test\sand\srecover1.test.
+D 2022-12-27T11:53:28.637
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -387,7 +387,7 @@ F ext/rbu/sqlite3rbu.c c4ba7901b2d3e0c7845f30840e3ffb35c6f999d6da0d80f121866491f
 F ext/rbu/sqlite3rbu.h 02d981e2d39c151391759e1a400e29c7388730812957ac3db8dad7f6c9f9cfc8
 F ext/rbu/test_rbu.c ee6ede75147bc081fe9bc3931e6b206277418d14d3fbceea6fdc6216d9b47055
 F ext/recover/dbdata.c 8f1f75d636431de69d7977ec50fc41bfdd0c48c510d5ee7eae0cbd4164e1429a
-F ext/recover/recover1.test 2a2df2943d6696f9487e75868feae4b1511c4a511b102854ba0d2af0326d9dfb
+F ext/recover/recover1.test 6a12f73330a2ca4d1428730c09272e294c5082c2806ae9e56db846374e03090d
 F ext/recover/recover_common.tcl a61306c1eb45c0c3fc45652c35b2d4ec19729e340bdf65a272ce4c229cefd85a
 F ext/recover/recoverclobber.test 3ba6c0c373c5c63d17e82eced64c05c57ccaf26c1abe1ca7141334022a79f32e
 F ext/recover/recovercorrupt.test 64c081ad1200ae77b447da99eb724785d6bf71715f394543dc7689642e92bf49
@@ -1874,7 +1874,7 @@ F test/walthread.test 14b20fcfa6ae152f5d8e12f5dc8a8a724b7ef189f5d8ef1e2ceab79f2a
 F test/walvfs.test e1a6ad0f3c78e98b55c3d5f0889cf366cc0d0a1cb2bccb44ac9ec67384adc4a1
 F test/wapp.tcl b440cd8cf57953d3a49e7ee81e6a18f18efdaf113b69f7d8482b0710a64566ec
 F test/wapptest.tcl 1bea58a6a8e68a73f542ee4fca28b771b84ed803bd0c9e385087070b3d747b3c x
-F test/where.test 16d9f4590985898f458a697f8ed35f2580f306daefbbd022114f09afe767b231
+F test/where.test c033c4c156e463fe1074a56dc914dfaa91de82b0dcf8a02f5fbc67cebecfdd17
 F test/where2.test 03c21a11e7b90e2845fc3c8b4002fc44cc2797fa74c86ee47d70bd7ea4f29ed6
 F test/where3.test 5b4ffc0ac2ea0fe92f02b1244b7531522fe4d7bccf6fa8741d54e82c10e67753
 F test/where4.test 4a371bfcc607f41d233701bdec33ac2972908ba8
@@ -2055,9 +2055,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 629dbe254346dc0b78025bb73def853bd725201244baa35cf169cf425930e184
-Q +9fa2b94c2e0fd43c1a9c15a79fe1325afa1699f0685dcd039024a80185cc5658
-R 024d45620f66a596cf8ef320b21a5369
-U drh
-Z d0514da4d116f429d87d9c4ee439a4b1
+P a31522261921a75c59d84448dab50896ba2a6e8a8e106c38b523081f78e5e22d
+R 9f1367e3aa33550e80fae24e8848dc4a
+U dan
+Z 87b3e7071e2d16b61542eb6b34694030
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 2453cae7a6..790f2fffa6 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a31522261921a75c59d84448dab50896ba2a6e8a8e106c38b523081f78e5e22d
\ No newline at end of file
+64588bd5da228026da8d2ba679625f36802f19944e00db79c832884ef4e429cd
\ No newline at end of file
diff --git a/test/where.test b/test/where.test
index a7ba647661..b559f5ee9d 100644
--- a/test/where.test
+++ b/test/where.test
@@ -1619,17 +1619,19 @@ do_execsql_test where-28.1 {
 
 # 2022-12-07 Yong Heng [https://sqlite.org/forum/forumpost/dfe8084751]
 #
-do_execsql_test where-29.1 {
-  SELECT DISTINCT 'xyz' FROM pragma_cache_size
-   WHERE rowid OR abs(0)
-   ORDER BY
-      1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-      1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-      1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-      1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-      1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-      1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-      1, 1, 1, 1;
-} {xyz}
+ifcapable vtab {
+  do_execsql_test where-29.1 {
+    SELECT DISTINCT 'xyz' FROM pragma_cache_size
+     WHERE rowid OR abs(0)
+     ORDER BY
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1;
+  } {xyz}
+}
 
 finish_test