From: drh <>
Date: Tue, 30 Jul 2024 16:59:33 +0000 (+0000)
Subject: Use the SQLite format() function to format floating point values for test
X-Git-Tag: version-3.47.0~273^2~4^2~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3302bf4dbdda5ba3ccbf3229ecd9e2fec3a6b06e;p=thirdparty%2Fsqlite.git

Use the SQLite format() function to format floating point values for test
results, to avoid inconsistences in TCL versions.

FossilOrigin-Name: 6a63c472190dafb36582c116c925bbcbe48c3a2f3217fc1ffcb64a733b0151e1
---

diff --git a/ext/fts5/test/fts5aa.test b/ext/fts5/test/fts5aa.test
index 57f878c7ca..bcad9e7241 100644
--- a/ext/fts5/test/fts5aa.test
+++ b/ext/fts5/test/fts5aa.test
@@ -453,7 +453,7 @@ db func funk funk
 # statement no longer fails.
 #
 do_catchsql_test 16.2 {
-  SELECT funk(), bm25(n1), funk() FROM n1 WHERE n1 MATCH 'a+b+c+d'
+  SELECT funk(), format('%g',bm25(n1)), funk() FROM n1 WHERE n1 MATCH 'a+b+c+d'
 } {0 {{} -1e-06 {}}}
 # {1 {SQL logic error}}
 
diff --git a/manifest b/manifest
index 6fb17d9191..a37275420c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\sincrblob\schannel\sso\sthat\spartial\sclose\sworks\swith\sTcl9.
-D 2024-07-30T16:51:51.690
+C Use\sthe\sSQLite\sformat()\sfunction\sto\sformat\sfloating\spoint\svalues\sfor\stest\nresults,\sto\savoid\sinconsistences\sin\sTCL\sversions.
+D 2024-07-30T16:59:33.915
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -112,7 +112,7 @@ F ext/fts5/fts5_vocab.c e4830b00809e5da53bc10f93adc59e321407b0f801c7f4167c0e47f5
 F ext/fts5/fts5parse.y eb526940f892ade5693f22ffd6c4f2702543a9059942772526eac1fde256bb05
 F ext/fts5/mkportersteps.tcl 5acf962d2e0074f701620bb5308155fa1e4a63ba
 F ext/fts5/test/fts5_common.tcl bc33c6cc65e5d390f28a68aeeb3a526dadd2c3a947d2466ee1986c1a4002df56
-F ext/fts5/test/fts5aa.test 183a2296fc4dab220f935dbb99a81f441bc6b7226fdda268597f755d69e8205b
+F ext/fts5/test/fts5aa.test 015c81b84d53bfcedd77d624202c8b02e9f0cbbb4b51688e3a9c9f90bccbb4ac
 F ext/fts5/test/fts5ab.test 4bdb619fee409e11417e8827e320b857e42e926a01a0408fc9f143ec870a6ced
 F ext/fts5/test/fts5ac.test 4a73626de86f3d17c95738034880c4f0de8d54741fb943d819b528373657e59b
 F ext/fts5/test/fts5ad.test 058e616612964e61d19f70295f0e6eaedceb4b29b1fbf4f859615ef7e779dc22
@@ -2200,8 +2200,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 6e5bb48a74d63fb8c30528f0005d1763cd2dbb882abf86baf1565721e6bfcf84
-R b6fac0aac026b18427ddeec14d1b1b88
+P d54ec2de78c2aed12be643e59a30b6827fe4728a0ab6504dd64ee9116e5f885a
+R 7f4866a427091a29b1780632dea5351c
 U drh
-Z 4e51314270d54eeb39bc75af76080956
+Z 73c4c9a57f9fc1f499055df74c59b8ce
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index f026a787f1..167a28a68a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d54ec2de78c2aed12be643e59a30b6827fe4728a0ab6504dd64ee9116e5f885a
+6a63c472190dafb36582c116c925bbcbe48c3a2f3217fc1ffcb64a733b0151e1