From 86876d2f6696498e40dc1e8096fcbd25d4a35242 Mon Sep 17 00:00:00 2001 From: stephan Date: Sun, 27 Sep 2026 15:54:38 +0000 Subject: [PATCH] Enable the --column-metadata configuration flag in the 'autoconf' build. It was previously disabled with a comment that it changed how sqlite3.c was generated, but that's not the case. Addresses [bugs:2026-09-27T13:25:48Z|bug report 2026-09-27T13:25:48Z]. FossilOrigin-Name: 03bb7acfe8af5dc22af698a73343cc5c003df2d57f321e3c1818826238e046b1 --- autosetup/sqlite-config.tcl | 6 +----- manifest | 14 +++++++------- manifest.uuid | 2 +- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index 328faad540..54b64249d2 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -223,16 +223,12 @@ proc sqlite-configure {buildMode configScript} { dbpage => {Enable the sqlite3_dbpage extension} dbstat => {Enable the sqlite3_dbstat extension} carray=1 => {Disable the CARRAY extension} + column-metadata => {Enable the column metadata APIs} all=$::sqliteConfig(all-flag-default) => {$allFlagHelp} largefile=1 => {This legacy flag has no effect on the library but may influence the generated sqlite_cfg.h by adding #define HAVE_LFS} } - {canonical} { - column-metadata => {Enable the column metadata APIs} - # ^^^ Affects how sqlite3.c is generated, so is not available in - # the autoconf build. - } } # Options for TCL support diff --git a/manifest b/manifest index 44ee2b9202..7bccf21032 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Improvements\sto\sdetection\sof\sinvalid\sJSONB\sin\sthe\sjson_pretty()\sfunction.\nThis\sis\san\senhancement,\snot\sa\sbug\sfix,\sas\sjson_pretty()\sdoes\snot\sguarantee\ndetection\sof\sinvalid\sJSONB,\sas\slong\sas\sthe\sinvalid\sJSONB\sdoes\snot\scause\sa\nmemory\serror.\n[bugs:/info/2026-09-25T15:59:04Z|Bug\s2026-09-25T15:59:04Z].\nTest\scases\sin\sTH3. -D 2026-09-26T11:21:43.931 +C Enable\sthe\s--column-metadata\sconfiguration\sflag\sin\sthe\s'autoconf'\sbuild.\sIt\swas\spreviously\sdisabled\swith\sa\scomment\sthat\sit\schanged\show\ssqlite3.c\swas\sgenerated,\sbut\sthat's\snot\sthe\scase.\sAddresses\s[bugs:2026-09-27T13:25:48Z|bug\sreport\s2026-09-27T13:25:48Z]. +D 2026-09-27T15:54:38.870 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -48,7 +48,7 @@ F autosetup/find_tclconfig.tcl 3394bcd1aad45d6af48262f50808d4f0ac4f1088ba8fa9d08 F autosetup/jimsh0.c daf13a86959fe2d055ed42d9417ceb63d698ae4b71bde959a0979ab729a83819 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba F autosetup/proj.tcl 67683f214977a416baafc4c1020f9940ff047a7306b2292c5872d6287460b7d5 -F autosetup/sqlite-config.tcl a503f8b418547c2872348dbcb71abb09726f3970088625ec90d8000035b06b32 +F autosetup/sqlite-config.tcl ab8665286daf9ca1af3e682756ffe7a503557810d004b5bed1617697e83db7be F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F autosetup/teaish/README.txt b40071e6f8506500a2f7f71d5fc69e0bf87b9d7678dd9da1e5b4d0acbf40b1ca F autosetup/teaish/core.tcl e014dd95900c7f9a34e8e0f460f47e94841059827bce8b4c49668b0c7ae3f1a0 @@ -2221,8 +2221,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P d28a4b4167c277e3e58d20dba7ec1880e235446ce99a959d2e9397707b621b1f -R 9f5b5962e08d1021cd3b440ad03abbc2 -U drh -Z 4badde9101a831f457b9bd2b4012b8e9 +P c1027e6aee96b1997492a4bb434c814afc5244032bd88b2b4d330312f283b974 +R ab62515849d85a98662c31c11e2994ba +U stephan +Z fe51ec1fcbaba4d13e8e6a9d7f398530 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 928054db5d..6bb6856fd7 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -c1027e6aee96b1997492a4bb434c814afc5244032bd88b2b4d330312f283b974 +03bb7acfe8af5dc22af698a73343cc5c003df2d57f321e3c1818826238e046b1