From: stephan <stephan@noemail.net>
Date: Fri, 23 Dec 2022 19:33:22 +0000 (+0000)
Subject: Merge trunk into wasm-session-api branch.
X-Git-Tag: version-3.41.0~183^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=77eac0507c7f36a50814336fb1da6a5c3923ffec;p=thirdparty%2Fsqlite.git

Merge trunk into wasm-session-api branch.

FossilOrigin-Name: f1decc831fe0dc8523956e74474d9663852b0e5b56240dd8504952726e713a97
---

77eac0507c7f36a50814336fb1da6a5c3923ffec
diff --cc ext/wasm/api/sqlite3-api-glue.js
index dc1e827d50,f1f93da73e..f5a6c5753d
--- a/ext/wasm/api/sqlite3-api-glue.js
+++ b/ext/wasm/api/sqlite3-api-glue.js
@@@ -696,13 -513,13 +706,13 @@@ self.sqlite3ApiBootstrap.initializers.p
      */
      capi.sqlite3_create_collation_v2 = function(pDb,zName,eTextRep,pArg,xCompare,xDestroy){
        if(6!==arguments.length) return __dbArgcMismatch(pDb, 'sqlite3_create_collation_v2', 6);
-       else if(capi.SQLITE_UTF8!==eTextRep){
-         return util.sqlite3_wasm_db_error(
-           pDb, capi.SQLITE_FORMAT, "SQLITE_UTF8 is the only supported encoding."
-         );
+       else if(!eTextRep){
+         eTextRep = capi.SQLITE_UTF8;
+       }else if(capi.SQLITE_UTF8!==eTextRep){
+         return __errEncoding(pDb);
        }
        let rc, pfCompare, pfDestroy;
 -     try{
 +      try{
          rc = __ccv2(pDb, zName, eTextRep, pArg, xCompare, xDestroy);
        }catch(e){
          rc = util.sqlite3_wasm_db_error(pDb, e);
diff --cc ext/wasm/api/sqlite3-wasm.c
index 39720ff9d1,ed3b96dea1..3f0d40e5cf
--- a/ext/wasm/api/sqlite3-wasm.c
+++ b/ext/wasm/api/sqlite3-wasm.c
@@@ -99,6 -99,6 +99,9 @@@
  #ifndef SQLITE_ENABLE_FTS4
  #  define SQLITE_ENABLE_FTS4 1
  #endif
++#ifndef SQLITE_ENABLE_MATH_FUNCTIONS
++#  define SQLITE_ENABLE_MATH_FUNCTIONS 1
++#endif
  #ifndef SQLITE_ENABLE_OFFSET_SQL_FUNC
  #  define SQLITE_ENABLE_OFFSET_SQL_FUNC 1
  #endif
diff --cc manifest
index a0be8ba9e6,b197045b1a..6075755a96
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Internal\scleanups\sand\sminor\sspeed\soptimizations\sin\sthe\ssqlite3.wasm.xWrap()\sinfrastructure.
- D 2022-12-23T18:14:36.766
 -C Consolidate/unify\show\sthe\sJS\sbindings\sof\sthe\screate_function/collation\sfamily\sof\sfunctions\sreact\sto\sa\snon-UTF8\sencoding:\sthey\snow\streat\sa\sfalsy\svalue\sas\sSQLITE_UTF8\sand\sfail\swith\sSQLITE_FORMAT\sfor\san\sinvalid\sencoding.
 -D 2022-12-23T19:16:45.370
++C Merge\strunk\sinto\swasm-session-api\sbranch.
++D 2022-12-23T19:33:22.552
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -491,10 -491,10 +491,10 @@@ F ext/userauth/sqlite3userauth.h 7f3ea8
  F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
  F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
  F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
- F ext/wasm/GNUmakefile 06d385b51bfb206cf779cf1bb816862f77df97fff97a6df9baf05b98c027067a
+ F ext/wasm/GNUmakefile ffe0e9818a3b6b36c85a1d10dab76b220a8f5cd83439c62e50223a7970b3d68a
  F ext/wasm/README-dist.txt 2d670b426fc7c613b90a7d2f2b05b433088fe65181abead970980f0a4a75ea20
  F ext/wasm/README.md ef39861aa21632fdbca0bdd469f78f0096f6449a720f3f39642594af503030e9
 -F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 4c7788042196cecab32f87d8e4965c183fea59037603888059f244b1752babcc
 +F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 8c15a035ca5263659f21a691d701e23294621a24d1e130fa8905a261b495ebe4
  F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
  F ext/wasm/api/README.md 77a2f1f2fc60a35def7455dffc8d3f2c56385d6ac5c6cecc60fa938252ea2c54
  F ext/wasm/api/extern-post-js.c-pp.js 8923f76c3d2213159e12d641dc750523ead5c848185dc4996fae5cc12397f88d
@@@ -503,7 -503,7 +503,7 @@@ F ext/wasm/api/post-js-footer.js cd0a8e
  F ext/wasm/api/post-js-header.js 47b6b281f39ad59fa6e8b658308cd98ea292c286a68407b35ff3ed9cfd281a62
  F ext/wasm/api/pre-js.c-pp.js b88499dc303c21fc3f55f2c364a0f814f587b60a95784303881169f9e91c1d5f
  F ext/wasm/api/sqlite3-api-cleanup.js 680d5ccfff54459db136a49b2199d9f879c8405d9c99af1dda0cc5e7c29056f4
- F ext/wasm/api/sqlite3-api-glue.js 5a28c384ece2066522cf8b04a454d44c0245835a6a26b681d3deed97b3805623
 -F ext/wasm/api/sqlite3-api-glue.js 72e63574caaf94aca36b40fa18bd76a267dd43ac6e7b5bd7293bc33ecb52230d
++F ext/wasm/api/sqlite3-api-glue.js d284d156812c9994067319997892fd0181dbbbca38401528a57d652478659d31
  F ext/wasm/api/sqlite3-api-oo1.js c0c4ccc269cccee657ffd03f094da7e270e1367b7928926b3730d543555a12a6
  F ext/wasm/api/sqlite3-api-prologue.js 1767dfcd94bb4fa9dd4bd9ff6327117783d3656faf1058dcc1369db320d871fc
  F ext/wasm/api/sqlite3-api-worker1.js e94ba98e44afccfa482874cd9acb325883ade50ed1f9f9526beb9de1711f182f
@@@ -512,7 -512,7 +512,7 @@@ F ext/wasm/api/sqlite3-opfs-async-proxy
  F ext/wasm/api/sqlite3-v-helper.js 6f6c3e390a72e08b0a5b16a0d567d7af3c04d172831853a29d72a6f1dd40ff24
  F ext/wasm/api/sqlite3-vfs-opfs.c-pp.js 66daf6fb6843bea615fe193109e1542efbeca24f560ee9da63375a910bb48115
  F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
- F ext/wasm/api/sqlite3-wasm.c f0aafd3e8f09c68bec14bd0cc7a31212964302134dec8c428e7afc517e78e257
 -F ext/wasm/api/sqlite3-wasm.c b114bb85cdf8be7b2939ddcc2bbc2f30c190c44b993c34a77b017c978345efb1
++F ext/wasm/api/sqlite3-wasm.c e2e8bddedd663fda5b3f7fda8d17ab229a5545a9a71cf2536282e4b2c06609ce
  F ext/wasm/api/sqlite3-worker1-promiser.js 0c7a9826dbf82a5ed4e4f7bf7816e825a52aff253afbf3350431f5773faf0e4b
  F ext/wasm/api/sqlite3-worker1.js 1e54ea3d540161bcfb2100368a2fc0cad871a207b8336afee1c445715851ec54
  F ext/wasm/batch-runner.html 4deeed44fe41496dc6898d9fb17938ea3291f40f4bfb977e29d0cef96fbbe4c8
@@@ -2067,8 -2067,8 +2067,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 0a39172ee134816f5ce17a403b960e9c22bb56efd5bcf77ecde465efe0d88b1d
- R 01a5a3416aa00dbf975dac1dad0558b8
 -P ac136925a6453d3e53c7a380911dfeac5706d49f936294289f6ea0b74e26e18a
 -R 9d755119137074f847904c767813a68a
++P c4dab53b8ea3401abd57671b8f3cb39fa4431b864d4c4e14ae24592f8d4cba0a deffe6fb211410fa1a1fbca824a52b4e09b54d4b4f4a4e12d71c9e4b7e8606fb
++R cadaf517f45465d31dbfac473e33edf0
  U stephan
- Z fd750e2a8255c013dd9faba040bbeb23
 -Z b32b2adc949da16fb78be22c10d5b0a1
++Z b1718e628e033cfc457bb4000e452e0e
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 8d218fa6ed,91be7497c9..a169f3c4f1
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c4dab53b8ea3401abd57671b8f3cb39fa4431b864d4c4e14ae24592f8d4cba0a
 -deffe6fb211410fa1a1fbca824a52b4e09b54d4b4f4a4e12d71c9e4b7e8606fb
++f1decc831fe0dc8523956e74474d9663852b0e5b56240dd8504952726e713a97