Avoid errors with SQLITE_OMIT_VIRTUALTABLE builds in json106.test and unionall.test.

FossilOrigin-Name: 90e8a233549a2d31e6959ce3fec927693b772ab3c0abce65e81d7350d2ca5cc6

diff --git a/manifest b/manifest
index 0689155ca960466e23c09f0a8f8f05d1b2021a40..c80ec9b824414df0a54ebdbbceb589266e48aff7 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Restructure\ssome\scode\sto\sfix\swhat\sappears\sto\sbe\sa\sfalse-positive\sUBSAN\swarning.
-D 2024-01-04T13:01:02.910
+C Avoid\serrors\swith\sSQLITE_OMIT_VIRTUALTABLE\sbuilds\sin\sjson106.test\sand\sunionall.test.
+D 2024-01-04T16:15:21.671
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1340,7 +1340,7 @@ F test/json102.test 557a46e16df1aa9bdbc4076a71a45814ea0e7503d6621d87d42a8c04cbc2
 F test/json103.test 53df87f83a4e5fa0c0a56eb29ff6c94055c6eb919f33316d62161a8880112dbe
 F test/json104.test 1b844a70cddcfa2e4cd81a5db0657b2e61e7f00868310f24f56a9ba0114348c1
 F test/json105.test 043838b56e68f3252a0dcf5be1689016f6f3f05056f8dcfcdc9d074f4d932988
-F test/json106.test dfd32e3bc829cd7068c98830f423d6e24cb55059ae3e5350e9a8a6d9bc4b6412
+F test/json106.test 2ad8a27f665a3d290c6dabba610b288160fcd13370295d868b4262f7f550a406
 F test/json501.test ab168a12eb6eb14d479f8c1cdae3ac062fd5a4679f17f976e96f1af518408330
 F test/json502.test 84634d3dbb521d2814e43624025b760c6198456c8197bbec6c977c0236648f5b
 F test/jsonb01.test cace70765b36a36aec9a85a41ea65667d3bbf647d4400ddc3ac76f8fe7d94f90
@@ -1865,7 +1865,7 @@ F test/types.test bf816ce73c7dfcfe26b700c19f97ef4050d194ff
 F test/types2.test 1aeb81976841a91eef292723649b5c4fe3bc3cac
 F test/types3.test 99e009491a54f4dc02c06bdbc0c5eea56ae3e25a
 F test/unhex.test b7f1b806207cb77fa31c3e434fe92fba524464e3e9356809bfcc28f15af1a8b7
-F test/unionall.test 6a1cf76f9a35dca9a2d8fbb0d9c709d63338ca3208e6b58972ddff5f4267df89
+F test/unionall.test 5b1c4186a661e4bf762875caf4c61d8fda3dd04a6fa9005187f6ba8900c2913f
 F test/unionall2.test 71e8fa08d5699d50dc9f9dc0c9799c2e7a6bb7931a330d369307a4df7f157fa1
 F test/unionallfault.test 652bfbb630e6c43135965dc1e8f0a9a791da83aec885d626a632fe1909c56f73
 F test/unionvtab.test e1704ab1b4c1bb3ffc9da4681f8e85a0b909fd80b937984fc94b27415ac8e5a4
@@ -2156,8 +2156,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 d546a9c94caf7408cc6e4530ec190d3a13fae09dc15b71b03d6369e02ee62abd
-R e1f7197b52fbcc05b1cd044084aa5ecc
-U drh
-Z 2859a9df9b5c4d7ab26ab170564bfb9b
+P fe952c12903ea2150880c8bb57cda2efc00ce9fa801568a68c619e0745f30567
+R 7c438168e98e2cde9f0e0435a5fc2196
+U dan
+Z 3e15fe8944f22fddf3becfb58910e865
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 46b4fd2c98316b205ccfc128528538dfa562a491..55ed17b5131dfc40e5325c9b7144106e2532caa8 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fe952c12903ea2150880c8bb57cda2efc00ce9fa801568a68c619e0745f30567
\ No newline at end of file
+90e8a233549a2d31e6959ce3fec927693b772ab3c0abce65e81d7350d2ca5cc6
\ No newline at end of file

diff --git a/test/json106.test b/test/json106.test
index f52d2b63860ab679ce26d34c63d8ceb472a3af47..c4ecc5538c5fb221cd7549fa4824acf9fe3a3913 100644 (file)
--- a/test/json106.test
+++ b/test/json106.test
@@ -15,6 +15,10 @@ set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 set testprefix json106
 
+# These tests require virtual table "json_tree" to run.
+ifcapable !vtab { finish_test ; return }
+asdfasdf
+
 load_static_extension db randomjson
 db eval {
   CREATE TEMP TABLE t1(j0,j5,p);

diff --git a/test/unionall.test b/test/unionall.test
index 1c580d29129316474ed01ffc17cfd75422cee5eb..99cb48a259d50a8431076d3e2516574a37ff88e5 100644 (file)
--- a/test/unionall.test
+++ b/test/unionall.test
@@ -346,11 +346,13 @@ do_execsql_test 5.10 {
 do_execsql_test 5.20 {
   SELECT *, '+' FROM t1 LEFT JOIN t3 ON (a NOT IN(SELECT v FROM t1 LEFT JOIN t2 ON (a=k))=k);
 } {0 {} {} {} + 1 one {} {} + 2 two {} {} + 5 five {} {} + 3 three {} {} + 6 six {} {} +}
+ifcapable vtab {
 do_catchsql_test 5.30 {
   SELECT * FROM (t1 NATURAL JOIN pragma_table_xinfo('t1_a') NATURAL JOIN t3) t1
                 NATURAL JOIN t2 NATURAL JOIN t3
    WHERE rowid ISNULL>0 AND 0%y;
 } {1 {no such column: rowid}}
+}
 
 reset_db
 do_execsql_test 6.0 {