SQLite 3.47.0.

2026-01-12 05:59:14 +00:00 · 2024-10-22 13:30:26 +01:00
parent 0cd0f48365
commit 64e2500ca8
16 changed files with 104 additions and 124 deletions
--- a/sqlite3/busy_timeout.patch
+++ b/sqlite3/busy_timeout.patch
@@ -1,8 +1,8 @@
-# Replace sqliteDefaultBusyCallback.
-# This patch allows Go to handle (and interrupt) sqlite3_busy_timeout.
+# Replace sqliteDefaultBusyCallback, so Go can
+# handle, and interrupt, sqlite3_busy_timeout.
 --- sqlite3.c.orig
 +++ sqlite3.c
-@@ -181614,7 +181614,7 @@
+@@ -182908,7 +182908,7 @@
   if( !sqlite3SafetyCheckOk(db) ) return SQLITE_MISUSE_BKPT;
 #endif
   if( ms>0 ){
--- a/sqlite3/download.sh
+++ b/sqlite3/download.sh
@@ -3,7 +3,7 @@ set -euo pipefail

 cd -P -- "$(dirname -- "$0")"

-curl -#OL "https://sqlite.org/2024/sqlite-amalgamation-3460100.zip"
+curl -#OL "https://sqlite.org/2024/sqlite-amalgamation-3470000.zip"
 unzip -d . sqlite-amalgamation-*.zip
 mv sqlite-amalgamation-*/sqlite3.c .
 mv sqlite-amalgamation-*/sqlite3.h .
@@ -21,25 +21,25 @@ cat *.patch | patch --no-backup-if-mismatch

 mkdir -p ext/
 cd ext/
-curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.46.1/ext/misc/anycollseq.c"
-curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.46.1/ext/misc/base64.c"
-curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.46.1/ext/misc/decimal.c"
-curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.46.1/ext/misc/ieee754.c"
-curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.46.1/ext/misc/regexp.c"
-curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.46.1/ext/misc/series.c"
-curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.46.1/ext/misc/spellfix.c"
-curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.46.1/ext/misc/uint.c"
+curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.47.0/ext/misc/anycollseq.c"
+curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.47.0/ext/misc/base64.c"
+curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.47.0/ext/misc/decimal.c"
+curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.47.0/ext/misc/ieee754.c"
+curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.47.0/ext/misc/regexp.c"
+curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.47.0/ext/misc/series.c"
+curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.47.0/ext/misc/spellfix.c"
+curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.47.0/ext/misc/uint.c"
 cd ~-

 cd ../vfs/tests/mptest/testdata/
-curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.46.1/mptest/mptest.c"
-curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.46.1/mptest/config01.test"
-curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.46.1/mptest/config02.test"
-curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.46.1/mptest/crash01.test"
-curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.46.1/mptest/crash02.subtest"
-curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.46.1/mptest/multiwrite01.test"
+curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.47.0/mptest/mptest.c"
+curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.47.0/mptest/config01.test"
+curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.47.0/mptest/config02.test"
+curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.47.0/mptest/crash01.test"
+curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.47.0/mptest/crash02.subtest"
+curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.47.0/mptest/multiwrite01.test"
 cd ~-

 cd ../vfs/tests/speedtest1/testdata/
-curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.46.1/test/speedtest1.c"
+curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.47.0/test/speedtest1.c"
 cd ~-
--- a/sqlite3/long_double.patch
+++ b/sqlite3/long_double.patch
@@ -1,29 +0,0 @@
--- sqlite3.c.orig
-+++ sqlite3.c
-@@ -35561,7 +35561,7 @@
- 
-   if( e==0 ){
-     *pResult = s;
-  }else if( sqlite3Config.bUseLongDouble ){
-+  }else if( sizeof(LONGDOUBLE_TYPE)>8 && sqlite3Config.bUseLongDouble ){
-     LONGDOUBLE_TYPE r = (LONGDOUBLE_TYPE)s;
-     if( e>0 ){
-       while( e>=100  ){ e-=100; r *= 1.0e+100L; }
-@@ -35967,7 +35967,7 @@
-   /* Multiply r by powers of ten until it lands somewhere in between
-   ** 1.0e+19 and 1.0e+17.
-   */
-  if( sqlite3Config.bUseLongDouble ){
-+  if( sizeof(LONGDOUBLE_TYPE)>8 && sqlite3Config.bUseLongDouble ){
-     LONGDOUBLE_TYPE rr = r;
-     if( rr>=1.0e+19 ){
-       while( rr>=1.0e+119L ){ exp+=100; rr *= 1.0e-100L; }
-@@ -89354,7 +89354,7 @@
-     ** than NULL */
-     return 1;
-   }
-  if( sqlite3Config.bUseLongDouble ){
-+  if( sizeof(LONGDOUBLE_TYPE)>8 && sqlite3Config.bUseLongDouble ){
-     LONGDOUBLE_TYPE x = (LONGDOUBLE_TYPE)i;
-     testcase( x<r );
-     testcase( x>r );
--- a/sqlite3/vfs.c
+++ b/sqlite3/vfs.c
@@ -89,59 +89,13 @@ struct go_file {
  go_handle handle;
 };

-int sqlite3_os_init() {
-  static sqlite3_vfs os_vfs = {
-      .iVersion = 2,
-      .szOsFile = sizeof(struct go_file),
-      .mxPathname = 1024,
-      .zName = "os",
-
-      .xOpen = go_open_wrapper,
-      .xDelete = go_delete,
-      .xAccess = go_access,
-      .xFullPathname = go_full_pathname,
-
-      .xRandomness = go_randomness,
-      .xSleep = go_sleep,
-      .xCurrentTimeInt64 = go_current_time_64,
-  };
-  return sqlite3_vfs_register(&os_vfs, /*default=*/true);
-}
-
-int localtime_s(struct tm *const pTm, time_t const *const pTime) {
-  return go_localtime(pTm, (sqlite3_int64)*pTime);
-}
-
 sqlite3_vfs *sqlite3_vfs_find(const char *zVfsName) {
-  if (zVfsName && go_vfs_find(zVfsName)) {
-    static sqlite3_vfs *go_vfs_list;
-
-    for (sqlite3_vfs *it = go_vfs_list; it; it = it->pNext) {
-      if (!strcmp(zVfsName, it->zName)) {
-        return it;
-      }
-    }
-
-    for (sqlite3_vfs **ptr = &go_vfs_list; *ptr;) {
-      sqlite3_vfs *it = *ptr;
-      if (go_vfs_find(it->zName)) {
-        ptr = &it->pNext;
-      } else {
-        *ptr = it->pNext;
-        free(it);
-      }
-    }
-
-    sqlite3_vfs *head = go_vfs_list;
-    go_vfs_list = malloc(sizeof(sqlite3_vfs) + strlen(zVfsName) + 1);
-    char *name = (char *)(go_vfs_list + 1);
-    strcpy(name, zVfsName);
-    *go_vfs_list = (sqlite3_vfs){
+  if (!zVfsName || !strcmp(zVfsName, "os")) {
+    static sqlite3_vfs os_vfs = {
        .iVersion = 2,
        .szOsFile = sizeof(struct go_file),
        .mxPathname = 1024,
-        .zName = name,
-        .pNext = head,
+        .zName = "os",

        .xOpen = go_open_wrapper,
        .xDelete = go_delete,
@@ -152,9 +106,60 @@ sqlite3_vfs *sqlite3_vfs_find(const char *zVfsName) {
        .xSleep = go_sleep,
        .xCurrentTimeInt64 = go_current_time_64,
    };
-    return go_vfs_list;
+    return &os_vfs;
  }
-  return sqlite3_vfs_find_orig(zVfsName);
+
+  if (!go_vfs_find(zVfsName)) {
+    return NULL;
+  }
+
+  static sqlite3_vfs *go_vfs_list;
+
+  for (sqlite3_vfs *it = go_vfs_list; it; it = it->pNext) {
+    if (!strcmp(zVfsName, it->zName)) {
+      return it;
+    }
+  }
+
+  for (sqlite3_vfs **ptr = &go_vfs_list; *ptr;) {
+    sqlite3_vfs *it = *ptr;
+    if (go_vfs_find(it->zName)) {
+      ptr = &it->pNext;
+    } else {
+      *ptr = it->pNext;
+      free(it);
+    }
+  }
+
+  sqlite3_vfs *head = go_vfs_list;
+  go_vfs_list = malloc(sizeof(sqlite3_vfs) + strlen(zVfsName) + 1);
+  char *name = (char *)(go_vfs_list + 1);
+  strcpy(name, zVfsName);
+  *go_vfs_list = (sqlite3_vfs){
+      .iVersion = 2,
+      .szOsFile = sizeof(struct go_file),
+      .mxPathname = 1024,
+      .zName = name,
+      .pNext = head,
+
+      .xOpen = go_open_wrapper,
+      .xDelete = go_delete,
+      .xAccess = go_access,
+      .xFullPathname = go_full_pathname,
+
+      .xRandomness = go_randomness,
+      .xSleep = go_sleep,
+      .xCurrentTimeInt64 = go_current_time_64,
+  };
+  return go_vfs_list;
+}
+
+int localtime_s(struct tm *const pTm, time_t const *const pTime) {
+  return go_localtime(pTm, (sqlite3_int64)*pTime);
+}
+
+int sqlite3_os_init() {
+  return SQLITE_OK;
 }

 static_assert(offsetof(sqlite3_vfs, zName) == 16, "Unexpected offset");
--- a/sqlite3/vfs_find.patch
+++ b/sqlite3/vfs_find.patch
@@ -1,13 +1,21 @@
-# Wrap sqlite3_vfs_find.
-# This patch allows Go VFSes to be (un)registered.
+# Remove VFS registration. Go handles it.
 --- sqlite3.c.orig
 +++ sqlite3.c
-@@ -26396,7 +26396,7 @@
- ** Locate a VFS by name.  If no name is given, simply return the
- ** first VFS on the list.
+@@ -26594,7 +26594,7 @@
+   sqlite3_free(p);
+   return sqlite3_os_init();
+ }
+-
+#if 0 // Go handles VFS registration.
+ /*
+ ** The list of all registered VFS implementations.
 */
-SQLITE_API sqlite3_vfs *sqlite3_vfs_find(const char *zVfs){
-+SQLITE_API sqlite3_vfs *sqlite3_vfs_find_orig(const char *zVfs){
-   sqlite3_vfs *pVfs = 0;
- #if SQLITE_THREADSAFE
-   sqlite3_mutex *mutex;
+@@ -26691,7 +26691,7 @@
+   sqlite3_mutex_leave(mutex);
+   return SQLITE_OK;
+ }
+-
+#endif
+ /************** End of os.c **************************************************/
+ /************** Begin file fault.c *******************************************/
+ /*