Skip to content

Commit 76da0dc

Browse files
author
drh
committed
Avoid errors with SQLITE_OMIT_VIRTUALTABLE builds in json106.test and unionall.test.
FossilOrigin-Name: 8940e2a1054fbc19fae3f76e743d744840c3a5aad001be8d3d56ca134226c34b
2 parents 267721e + de70e8b commit 76da0dc

4 files changed

Lines changed: 14 additions & 8 deletions

File tree

manifest

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
C Restructure\ssome\scode\sto\sfix\swhat\sappears\sto\sbe\sa\sfalse-positive\sUBSAN\swarning.
2-
D 2024-01-04T13:01:02.910
1+
C Avoid\serrors\swith\sSQLITE_OMIT_VIRTUALTABLE\sbuilds\sin\sjson106.test\sand\sunionall.test.
2+
D 2024-01-04T17:13:39.373
33
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
44
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
55
F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1340,7 +1340,7 @@ F test/json102.test 557a46e16df1aa9bdbc4076a71a45814ea0e7503d6621d87d42a8c04cbc2
13401340
F test/json103.test 53df87f83a4e5fa0c0a56eb29ff6c94055c6eb919f33316d62161a8880112dbe
13411341
F test/json104.test 1b844a70cddcfa2e4cd81a5db0657b2e61e7f00868310f24f56a9ba0114348c1
13421342
F test/json105.test 043838b56e68f3252a0dcf5be1689016f6f3f05056f8dcfcdc9d074f4d932988
1343-
F test/json106.test dfd32e3bc829cd7068c98830f423d6e24cb55059ae3e5350e9a8a6d9bc4b6412
1343+
F test/json106.test 1d46a9294e2ced35c7f87cebbcb9626d01abab04f1969d7ded7b6f6a1d9be0f2
13441344
F test/json501.test ab168a12eb6eb14d479f8c1cdae3ac062fd5a4679f17f976e96f1af518408330
13451345
F test/json502.test 84634d3dbb521d2814e43624025b760c6198456c8197bbec6c977c0236648f5b
13461346
F test/jsonb01.test cace70765b36a36aec9a85a41ea65667d3bbf647d4400ddc3ac76f8fe7d94f90
@@ -1865,7 +1865,7 @@ F test/types.test bf816ce73c7dfcfe26b700c19f97ef4050d194ff
18651865
F test/types2.test 1aeb81976841a91eef292723649b5c4fe3bc3cac
18661866
F test/types3.test 99e009491a54f4dc02c06bdbc0c5eea56ae3e25a
18671867
F test/unhex.test b7f1b806207cb77fa31c3e434fe92fba524464e3e9356809bfcc28f15af1a8b7
1868-
F test/unionall.test 6a1cf76f9a35dca9a2d8fbb0d9c709d63338ca3208e6b58972ddff5f4267df89
1868+
F test/unionall.test 5b1c4186a661e4bf762875caf4c61d8fda3dd04a6fa9005187f6ba8900c2913f
18691869
F test/unionall2.test 71e8fa08d5699d50dc9f9dc0c9799c2e7a6bb7931a330d369307a4df7f157fa1
18701870
F test/unionallfault.test 652bfbb630e6c43135965dc1e8f0a9a791da83aec885d626a632fe1909c56f73
18711871
F test/unionvtab.test e1704ab1b4c1bb3ffc9da4681f8e85a0b909fd80b937984fc94b27415ac8e5a4
@@ -2156,8 +2156,9 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
21562156
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
21572157
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
21582158
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
2159-
P d546a9c94caf7408cc6e4530ec190d3a13fae09dc15b71b03d6369e02ee62abd
2160-
R e1f7197b52fbcc05b1cd044084aa5ecc
2159+
P fe952c12903ea2150880c8bb57cda2efc00ce9fa801568a68c619e0745f30567 90e8a233549a2d31e6959ce3fec927693b772ab3c0abce65e81d7350d2ca5cc6
2160+
R 1b0244f5731b1e66c7e1ef8d70f19d5b
2161+
T +closed 90e8a233549a2d31e6959ce3fec927693b772ab3c0abce65e81d7350d2ca5cc6
21612162
U drh
2162-
Z 2859a9df9b5c4d7ab26ab170564bfb9b
2163+
Z 5d98a22501c46b821d62bf99693fba4a
21632164
# Remove this line to create a well-formed Fossil manifest.

manifest.uuid

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
fe952c12903ea2150880c8bb57cda2efc00ce9fa801568a68c619e0745f30567
1+
8940e2a1054fbc19fae3f76e743d744840c3a5aad001be8d3d56ca134226c34b

test/json106.test

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ set testdir [file dirname $argv0]
1515
source $testdir/tester.tcl
1616
set testprefix json106
1717

18+
# These tests require virtual table "json_tree" to run.
19+
ifcapable !vtab { finish_test ; return }
20+
1821
load_static_extension db randomjson
1922
db eval {
2023
CREATE TEMP TABLE t1(j0,j5,p);

test/unionall.test

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -346,11 +346,13 @@ do_execsql_test 5.10 {
346346
do_execsql_test 5.20 {
347347
SELECT *, '+' FROM t1 LEFT JOIN t3 ON (a NOT IN(SELECT v FROM t1 LEFT JOIN t2 ON (a=k))=k);
348348
} {0 {} {} {} + 1 one {} {} + 2 two {} {} + 5 five {} {} + 3 three {} {} + 6 six {} {} +}
349+
ifcapable vtab {
349350
do_catchsql_test 5.30 {
350351
SELECT * FROM (t1 NATURAL JOIN pragma_table_xinfo('t1_a') NATURAL JOIN t3) t1
351352
NATURAL JOIN t2 NATURAL JOIN t3
352353
WHERE rowid ISNULL>0 AND 0%y;
353354
} {1 {no such column: rowid}}
355+
}
354356

355357
reset_db
356358
do_execsql_test 6.0 {

0 commit comments

Comments
 (0)