From 2f641dbdeb07ac16ffde5796bcabef11b1fc840a Mon Sep 17 00:00:00 2001 From: drh <> Date: Tue, 20 Oct 2026 13:10:11 +0000 Subject: [PATCH] Test case changes to handle non-standard configurations. FossilOrigin-Name: 185ffd27064bab83d3e4c39353ab5bea15e99155f8cc851c03abd49641fbfdb5 --- manifest | 16 +++++----- manifest.uuid | 2 +- test/enc.test | 24 ++++++++------- test/json501.test | 34 +++++++++++---------- test/nulls1.test | 75 ++++++++++++++++++++++++----------------------- 5 files changed, 78 insertions(+), 73 deletions(-) diff --git a/manifest b/manifest index 80e29c92e7..3c97d304fc 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\san\sextra\ssqlite3MemoryBarrier()\scall\sin\ssqlite3_initialize()\sto\savoid\na\srace\scondition\sthat\sonly\shappens\son\snon-X64\sCPUs.\n[bugs:/info/2026-10-20T07:33:27Z|Bug\s2026-10-20T07:33:27Z] -D 2026-10-20T12:42:26.067 +C Test\scase\schanges\sto\shandle\snon-standard\sconfigurations. +D 2026-10-20T13:10:11.502 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -1166,7 +1166,7 @@ F test/e_walauto.test 248af31e73c98df23476a22bdb815524c9dc3ba8 F test/e_walckpt.test 16e7d006e8687654ee59e7ad5a6d285ba23f0fe0eeb87f790afd6bc9cf1d1924 F test/e_walhook.test 01b494287ba9e60b70f6ebf3c6c62e0ffe01788e344a4846b08e5de0b344cb66 F test/emptytable.test a38110becbdfa6325cd65cb588dca658cd885f62 -F test/enc.test f488f71ca2fa3bcaa4ed487238b247be693b5291f19ca241d742386dabc17c55 +F test/enc.test e24641bea889db4ac6c2b4da6f5025dcc90bec6412e9a669b1e585233682fd00 F test/enc2.test 872afe58db772e7dfa1ad8e0759f8cc820e9efc8172d460fae83023101c2e435 F test/enc3.test 55ef64416d72975c66167310a51dc9fc544ba3ae4858b8d5ab22f4cb6500b087 F test/enc4.test c8f1ce3618508fd0909945beb8b8831feef2c020 @@ -1448,7 +1448,7 @@ F test/json106.test 4aed3afd16549045d198a8d9cea00deea96e1f2ecf55864dce96cac558b8 F test/json107.test 59054e815c8f6b67d634d44ace421cf975828fb5651c4460aa66015c8e19d562 F test/json108.test eab1859b19138ee03acd4415751308fc3849943c669a06b515bba658b96b55c3 F test/json109.test 441cea5d73c24a1a34d284101740dfae5a082237c048c8a66b03aeebe5e3643e -F test/json501.test 37889447b2f0a774711ad7a0a653fa3f59ba5c61e4d7a5a2bd92ecf4ba7579f5 +F test/json501.test 278c636a2600ade099b0d078e42999d5b36a6de5a4dc93fd0ce44a9a051f8e22 F test/json502.test 4ef68e4f272dfb083d4cbceb4e9e51d67ec1186a185e0c13637c50a4dc2f9796 F test/jsonb01.test 42419c8080af5660cdfd3fddec322d28bdbc244d9800ee9569091d455f1c0dea F test/keyword1.test 37ef6bba5d2ed5b07ecdd6810571de2956599dff @@ -1553,7 +1553,7 @@ F test/notnull.test a37b663d5bb728d66fc182016613fb8e4a0a4bbf3d75b8876a7527f7d4ed F test/notnull2.test c2c7b670fb8fa6ffe5f9cc08af88864fbb8237e28b56ad528e8dee921019c5fe F test/notnullfault.test fc4bb7845582a2b3db376001ef49118393b1b11abe0d24adb03db057ee2b73d5 F test/null.test b7ff206a1c60fe01aa2abd33ef9ea83c93727d993ca8a613de86e925c9f2bc6f -F test/nulls1.test 31aa1320772ad95d9ae8351015697151f737137f101c6fae9e26cd2f7ec115ca +F test/nulls1.test 3215e35bd3a2001c3a0fe0479a9f44405be81a6852e681c25976d7a24d4b3bbf F test/nulls2.test 20356ab1de69f78363faed9c2cd8eb455bb92f805572c405131f1c5d8f2d37fb F test/numcast.test 5d126f7f581432e86a90d1e35cac625164aec4a1 F test/numindex1.test 20a5450d4b056e48cd5db30e659f13347a099823 @@ -2294,8 +2294,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P c40e620b04aaa3c90501124db27711b1d4e8ae830f75828c7cccf84f7df42660 -R dc152ce0243878ee4f806d07bfca301b +P 37b83ad2f5245217a4a4626916c3974acb3491fc5d45ed082ac0386e9d84b4ce +R 4b5413d97b9f24442bd58816f3c3c738 U drh -Z 7ec4d6253cf29cf350614d5b4ae30564 +Z b9b271ac439439f0cf0959b44ebd6f73 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 9d92e44965..face9d4eee 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -37b83ad2f5245217a4a4626916c3974acb3491fc5d45ed082ac0386e9d84b4ce +185ffd27064bab83d3e4c39353ab5bea15e99155f8cc851c03abd49641fbfdb5 diff --git a/test/enc.test b/test/enc.test index 5b042a4c37..be5b454172 100644 --- a/test/enc.test +++ b/test/enc.test @@ -290,16 +290,18 @@ do_execsql_test enc-14.1 { } {1000 2000 1000 5000 10000 5000} # Bug 2026-10-14T17:33:12Z -reset_db -do_execsql_test enc-15.0 { - PRAGMA encoding = UTF16; - CREATE TABLE t1(a); - INSERT INTO t1 VALUES(123); - ALTER TABLE t1 ADD COLUMN b DEFAULT x'9e2e'; - CREATE TABLE t2(a, b DEFAULT x'9e2e'); - INSERT INTO t2(a) VALUES(123); - SELECT 'match' FROM t1 JOIN t2 - WHERE CAST(t1.b AS TEXT)=CAST(t2.b AS TEXT); -} match +ifcapable altertable { + reset_db + do_execsql_test enc-15.0 { + PRAGMA encoding = UTF16; + CREATE TABLE t1(a); + INSERT INTO t1 VALUES(123); + ALTER TABLE t1 ADD COLUMN b DEFAULT x'9e2e'; + CREATE TABLE t2(a, b DEFAULT x'9e2e'); + INSERT INTO t2(a) VALUES(123); + SELECT 'match' FROM t1 JOIN t2 + WHERE CAST(t1.b AS TEXT)=CAST(t2.b AS TEXT); + } match +} finish_test diff --git a/test/json501.test b/test/json501.test index eef1b5635e..8f5f22c276 100644 --- a/test/json501.test +++ b/test/json501.test @@ -334,37 +334,39 @@ for {set c 1} {$c<=0x1f} {incr c} { # Forum post 2026-10-14T08:42:26Z # -do_execsql_test 15.0 { - WITH json(jid,jx) AS (VALUES - (1,'{"a":"text","b":123,"c":[1,2,3,"t",{"cc":99,"dd":100}],"d":null}'), - (2,'[1,"a",{"aa":11,"bb":[9,8,7]},null]') - ), paths(pid,px) AS (VALUES(1,'$.c[4]'),(2,'$.c'),(3,'$[2].bb'),(4,'$[2]')) - SELECT jj.key, typeof(jj.key) FROM json, paths, json_tree(jx,px) AS jj - WHERE parent IS NULL - ORDER BY jid, pid; -} {4 integer c text bb text 2 integer} +ifcapable vtab { + do_execsql_test 15.0 { + WITH json(jid,jx) AS (VALUES + (1,'{"a":"text","b":123,"c":[1,2,3,"t",{"cc":99,"dd":100}],"d":null}'), + (2,'[1,"a",{"aa":11,"bb":[9,8,7]},null]') + ), paths(pid,px) AS (VALUES(1,'$.c[4]'),(2,'$.c'),(3,'$[2].bb'),(4,'$[2]')) + SELECT jj.key, typeof(jj.key) FROM json, paths, json_tree(jx,px) AS jj + WHERE parent IS NULL + ORDER BY jid, pid; + } {4 integer c text bb text 2 integer} +} # Bug 2026-10-18T04:42:37Z # -do_execsql_test 14.1 { +do_execsql_test 16.1 { SELECT hex(('"ab\' || char(10) || '"') ->> '$'); } {6162} -do_execsql_test 14.2 { +do_execsql_test 16.2 { SELECT hex(('"ab\' || char(13,10) || '"') ->> '$'); } {6162} -do_execsql_test 14.3 { +do_execsql_test 16.3 { SELECT hex(('"ab\' || char(8232) || '"') ->> '$'); } {6162} -do_execsql_test 14.4 { +do_execsql_test 16.4 { SELECT hex(('"\' || char(10) || '"') ->> '$'); } {{}} -do_execsql_test 14.5 { +do_execsql_test 16.5 { SELECT hex(jsonb('"ab\' || char(10) || '"') ->> '$'); } {6162} -do_execsql_test 14.6 { +do_execsql_test 16.6 { SELECT hex(('"ab\' || char(10) || 'c"') ->> '$'); } {616263} -do_execsql_test 14.7 { +do_execsql_test 16.7 { SELECT hex('"ab\u0000"' ->> '$'); } {616200} diff --git a/test/nulls1.test b/test/nulls1.test index 89825d5437..63a95aaeb3 100644 --- a/test/nulls1.test +++ b/test/nulls1.test @@ -416,42 +416,43 @@ do_execsql_test 12.9 { SELECT DISTINCT c0 FROM t0 INDEXED BY i0 ORDER BY c0 ASC NULLS LAST; } {A {}} -#------------------------------------------------------------------------- -# Report -# -reset_db - -do_execsql_test 13.0 { - CREATE TABLE t1(a PRIMARY KEY) WITHOUT ROWID; - INSERT INTO t1 VALUES(1.5); - ALTER TABLE t1 ADD COLUMN b; - PRAGMA integrity_check; -} {ok} - -do_execsql_test 13.1 { - SELECT * FROM t1 WHERE a IN (1.5, 'myval2') ORDER BY b NULLS LAST; -} {1.5 {}} - -do_execsql_test 13.2 { - SELECT * FROM t1 WHERE a = 1.5 AND b IS NULL; -} {1.5 {}} - -do_execsql_test 13.3 { - CREATE TABLE t2(a PRIMARY KEY) WITHOUT ROWID; - INSERT INTO t2 VALUES(1), (2); - ALTER TABLE t2 ADD COLUMN b DEFAULT 5; - INSERT INTO t2 VALUES(3, NULL); -} - -do_execsql_test 13.4 { - SELECT * FROM t2 WHERE a IN (1, 2, 3) ORDER BY b NULLS LAST; -} {1 5 2 5 3 {}} - -do_execsql_test 13.5 { - CREATE TABLE t3(a); - INSERT INTO t3 VALUES(1),(2); - SELECT * FROM t3 ORDER BY rowid NULLS LAST; -} {1 2} - +ifcapable altertable { + #------------------------------------------------------------------------- + # Bug 2026-10-15T03:54:19Z + # + reset_db + + do_execsql_test 13.0 { + CREATE TABLE t1(a PRIMARY KEY) WITHOUT ROWID; + INSERT INTO t1 VALUES(1.5); + ALTER TABLE t1 ADD COLUMN b; + PRAGMA integrity_check; + } {ok} + + do_execsql_test 13.1 { + SELECT * FROM t1 WHERE a IN (1.5, 'myval2') ORDER BY b NULLS LAST; + } {1.5 {}} + + do_execsql_test 13.2 { + SELECT * FROM t1 WHERE a = 1.5 AND b IS NULL; + } {1.5 {}} + + do_execsql_test 13.3 { + CREATE TABLE t2(a PRIMARY KEY) WITHOUT ROWID; + INSERT INTO t2 VALUES(1), (2); + ALTER TABLE t2 ADD COLUMN b DEFAULT 5; + INSERT INTO t2 VALUES(3, NULL); + } + + do_execsql_test 13.4 { + SELECT * FROM t2 WHERE a IN (1, 2, 3) ORDER BY b NULLS LAST; + } {1 5 2 5 3 {}} + + do_execsql_test 13.5 { + CREATE TABLE t3(a); + INSERT INTO t3 VALUES(1),(2); + SELECT * FROM t3 ORDER BY rowid NULLS LAST; + } {1 2} +} finish_test