diff --git a/manifest b/manifest index 327545aae7..8a4777dfdc 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Allow\swindows\sclients\sto\sopen\sand\srecover\sa\swal\smode\sdatabase\seven\sif\san\sold\sclient\sstill\shas\sthe\s*-shm\sfile\smapped.\sForum\spost\s[forum:/info/2026-10-05T14:07:31Z\s|\s2026-10-05T14:07:31Z]. -D 2026-10-05T17:11:27.214 +C Do\snot\srun\snew\svirtual\stable\stests\sin\smemdb1.test\sfor\sSQLITE_OMIT_VIRTUALTABLE\sbuilds. +D 2026-10-05T17:25:06.226 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -1495,7 +1495,7 @@ F test/malloctraceviewer.tcl 3e3ddf11e30d2b20f53aa16aa6615082fb24a100bea61cca721 F test/manydb.test 28385ae2087967aa05c38624cec7d96ec74feb3e F test/mem5.test c6460fba403c5703141348cd90de1c294188c68f F test/memdb.test c1f2a343ad14398d5d6debda6ea33e80d0dafcc7 -F test/memdb1.test d7e499e70d647341aa226cac9b6d715d215cba0e4583308e39c95147781dbbec +F test/memdb1.test 01eade2d45b0a2bc3089eed1802f4dcfa5f2a70b49fe68e3805b832cba07db86 F test/memdb2.test 4ba1fc09e2f51df80d148a540e4a3fa66d0462e91167b27497084de4d1f6b5b4 F test/memjournal.test 70f3a00c7f84ee2978ad14e831231caa1e7f23915a2c54b4f775a021d5740c6c F test/memjournal2.test dbc2c5cb5f7b38950f4f6dc3e73fcecf0fcbed3fc32c7ce913bba164d288da1e @@ -2279,8 +2279,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P bc72b1d95c2f098a92013ad9f4ab60440c105cd17889d12ae7349a4531a90c75 -R d807db430396ddbab88ff7374b0a00c2 +P 7c103a0b7d509dce58aa87518e13213451e5f70938ff08aa55accd645e3b2ff3 +R d57c5af62e36720b595773e6d70b41f1 U dan -Z 17580f838c995b8e4c097c3d30c6d5d6 +Z 26683381c05f7eb44de265056a44d6ec # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 3be135953e..d8064d2a3e 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -7c103a0b7d509dce58aa87518e13213451e5f70938ff08aa55accd645e3b2ff3 +eced240b2a991ff8255f98d189a6874dda44e3cdb1fcd07e74abddf2a9a71ea4 diff --git a/test/memdb1.test b/test/memdb1.test index f1f33c3523..b985757e45 100644 --- a/test/memdb1.test +++ b/test/memdb1.test @@ -347,44 +347,46 @@ do_test 1110 { # # Report: https://sqlite.org/bugs/forumpost/2fbe01f58f # -reset_db -sqlite3 db :memory: - -do_execsql_test 1210 { - CREATE TABLE t(x); - SELECT * FROM json_each('[1]'); -} { - 0 1 integer 1 1 {} {$[0]} {$} -} - -set blob [db serialize main] -db deserialize main $blob - -do_execsql_test 1220 { - SELECT * FROM json_each('[1]'); -} { - 0 1 integer 1 1 {} {$[0]} {$} -} - -# Attempt to deserialize while a statement that uses an eponymous -# virtual table is still active. The deserialize should fail. -# -do_test 1230 { - set res [list] - set msg "" - db eval { SELECT value FROM json_each('[1,2,3]') } { - if {$msg==""} { - catch { db deserialize main $blob } msg - } - lappend res $value +ifcapable vtab { + reset_db + sqlite3 db :memory: + + do_execsql_test 1210 { + CREATE TABLE t(x); + SELECT * FROM json_each('[1]'); + } { + 0 1 integer 1 1 {} {$[0]} {$} } - set res -} {1 2 3} -do_test 1240 { - set msg -} {unable to set MEMDB content} -do_execsql_test 1250 { - SELECT value FROM json_each('[4,5]'); -} {4 5} + + set blob [db serialize main] + db deserialize main $blob + + do_execsql_test 1220 { + SELECT * FROM json_each('[1]'); + } { + 0 1 integer 1 1 {} {$[0]} {$} + } + + # Attempt to deserialize while a statement that uses an eponymous + # virtual table is still active. The deserialize should fail. + # + do_test 1230 { + set res [list] + set msg "" + db eval { SELECT value FROM json_each('[1,2,3]') } { + if {$msg==""} { + catch { db deserialize main $blob } msg + } + lappend res $value + } + set res + } {1 2 3} + do_test 1240 { + set msg + } {unable to set MEMDB content} + do_execsql_test 1250 { + SELECT value FROM json_each('[4,5]'); + } {4 5} +} finish_test