Fix a new JSON test case so that it works even if SQLITE_OMIT_VIRTUALTABLE

is defined.

FossilOrigin-Name: b995aae510888a9746b46545d176a0885d4738e1f1bc0b7ad7937ed023efd7d6

diff --git a/manifest b/manifest
index 38b51746de0184146218dd88dd490d911d0589d8..e32e4e25709149f87f8321f81fcaf7eca7832843 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\srun\stest\sscript\sfts5origintest4.test\swith\seither\s"memsubsys1"\sor\s"mmap"\spermutations.
-D 2023-12-15T15:17:39.739
+C Fix\sa\snew\sJSON\stest\scase\sso\sthat\sit\sworks\seven\sif\sSQLITE_OMIT_VIRTUALTABLE\nis\sdefined.
+D 2023-12-15T15:22:03.625
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1339,7 +1339,7 @@ F test/json103.test 53df87f83a4e5fa0c0a56eb29ff6c94055c6eb919f33316d62161a888011
 F test/json104.test 1b844a70cddcfa2e4cd81a5db0657b2e61e7f00868310f24f56a9ba0114348c1
 F test/json105.test e64a8d73677fbae67886642cd5076e2ef3efe89f8483b87595cf9c030216c9bd
 F test/json501.test ab168a12eb6eb14d479f8c1cdae3ac062fd5a4679f17f976e96f1af518408330
-F test/json502.test 3c697e506fc38ccb455b49660b21b6e62e08ede0f2d0c869a7d171e17809093c
+F test/json502.test 84634d3dbb521d2814e43624025b760c6198456c8197bbec6c977c0236648f5b
 F test/jsonb01.test cace70765b36a36aec9a85a41ea65667d3bbf647d4400ddc3ac76f8fe7d94f90
 F test/keyword1.test 37ef6bba5d2ed5b07ecdd6810571de2956599dff
 F test/kvtest.c 6e0228409ea7ca0497dad503fbd109badb5e59545d131014b6aaac68b56f484a
@@ -2153,8 +2153,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 6b4e1344a28c213cbe8fb97f7f3f6688de93fb73ed96bf460ff74c959da1a712
-R 5009aa3a7688d2e0f2d3fd5b288c1e45
-U dan
-Z a7e6258d44595ae5e733a4da3cda0926
+P 05a63d9603ef42cbee6dadff72d97583a9c78e549f70e9a808534d5c1ae7c28a
+R 3314c5bf0699d50c465bd6395bdb0dc5
+U drh
+Z 6217845991b9f421ba875e859fa5fd55
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 433a91385fa25aba62d0f8ff5920bda8a5fe6ae8..a473849eb80f52c90a73b99f3951bcc79399581e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-05a63d9603ef42cbee6dadff72d97583a9c78e549f70e9a808534d5c1ae7c28a
\ No newline at end of file
+b995aae510888a9746b46545d176a0885d4738e1f1bc0b7ad7937ed023efd7d6
\ No newline at end of file

diff --git a/test/json502.test b/test/json502.test
index 48c372c4f89eb83e5fca0dfe05a51760a7a5314c..cc14b8cb71c2e8880771fc9d83abad7200e81bee 100644 (file)
--- a/test/json502.test
+++ b/test/json502.test
@@ -47,7 +47,7 @@ do_execsql_test 3.2 {
 
 db null null
 do_execsql_test 3.3 {
-  DROP TABLE t1;
+  DROP TABLE IF EXISTS t1;
   CREATE TABLE t1(x);
   INSERT INTO t1 VALUES(json_insert('{}','$.a\',111,'$."b\\"',222));
   INSERT INTO t1 VALUES(jsonb_insert('{}','$.a\',111,'$."b\\"',222));
@@ -58,8 +58,10 @@ do_execsql_test 3.4 {
   SELECT json_patch('{"a\x62c":123}','{"ab\x63":456}') ->> 'abc';
 } 456
 
-do_execsql_test 4.1 {
-  SELECT * FROM json_tree('{"\u0017":1}','$."\x17"');
-} {{\x17} 1 integer 1 1 null {$."\x17"} {$}}
+ifcapable vtab {
+  do_execsql_test 4.1 {
+    SELECT * FROM json_tree('{"\u0017":1}','$."\x17"');
+  } {{\x17} 1 integer 1 1 null {$."\x17"} {$}}
+}
 
 finish_test