extra futzing

There is a sqlar extension and program so name
them differently

Remove the 3.52 timestamp vfs

Author: rogerbinns

apsw/sqlite_extra.json

@@ -104,8 +104,8 @@
         "type": "extension"
     },
     "sqlar": {
-        "description": "Command line SQL archive tool",
-        "type": "executable"
+        "description": "Utility functions for SQL archives",
+        "type": "extension"
     },
     "sqlite3_dbdump": {
         "description": "Converts the content of a SQLite database into UTF-8 text SQL statements that can be used to exactly recreate the original database",
@@ -175,14 +175,14 @@
         "description": "Shows contents of stat4 index of a database",
         "type": "executable"
     },
-    "sqlite3_showtmlog": {
-        "description": "Makes human/csv readable output from a tmstmpvfs log file",
-        "type": "executable"
-    },
     "sqlite3_showwal": {
         "description": "Shows low level content of a WAL file",
         "type": "executable"
     },
+    "sqlite3_sqlar": {
+        "description": "Command line SQL archive tool",
+        "type": "executable"
+    },
     "stmt": {
         "description": "Virtual table with information about all prepared statements on a connection",
         "type": "extension"
@@ -191,10 +191,6 @@
         "description": "Function that returns the same sequence of random integers is returned for each invocation of the statement",
         "type": "extension"
     },
-    "tmstmpvfs": {
-        "description": "VFS shim that writes timestamps and other tracing information to the reserved bytes of each page, and also generates corresponding log files",
-        "type": "extension"
-    },
     "uint": {
         "description": "UINT collating sequence",
         "type": "extension"

doc/extra.rst

@@ -40,7 +40,7 @@ statically for those extensions and programs.
 TCL
 +++
 
-Some of the tools require `TCL <https://www.tcl-lang.org/>`__ and are
+Some of the programs require `TCL <https://www.tcl-lang.org/>`__ and are
 omitted.
 
 Readline

doc/sqlite_extra.rst-inc

@@ -5,10 +5,6 @@ Programs
 --------
 
 
-sqlar (`doc <https://sqlite.org/sqlar/>`__)
-
-   Command line SQL archive tool
-
 sqlite3_dbdump (`doc <https://sqlite.org/src/file?ci=trunk&name=ext%2fmisc%2fdbdump.c>`__)
 
    Converts the content of a SQLite database into UTF-8 text SQL statements that can be used to exactly recreate the original database
@@ -77,14 +73,14 @@ sqlite3_showstat4 (`doc <https://sqlite.org/src/file?ci=trunk&name=tool%2fshowst
 
    Shows contents of stat4 index of a database
 
-sqlite3_showtmlog (`doc <https://sqlite.org/src/file?ci=trunk&name=tool%2fshowtmlog.c>`__)
-
-   Makes human/csv readable output from a tmstmpvfs log file
-
 sqlite3_showwal (`doc <https://sqlite.org/src/file?ci=trunk&name=tool%2fshowwal.c>`__)
 
    Shows low level content of a WAL file
 
+sqlite3_sqlar (`doc <https://sqlite.org/sqlar/>`__)
+
+   Command line SQL archive tool
+
 
 Extensions
 ----------
@@ -181,7 +177,7 @@ Extensions
       - `link <https://sqlite.org/src/file?ci=trunk&name=ext%2fmisc%2ffileio.c>`__
       - Implements SQL functions readfile() and writefile(), and eponymous virtual type 'fsdir'
       -
-        * Function: :code:`lsmode` :code:`readfile` :code:`realpath` :code:`writefile`
+        * Function: :code:`lsmode` :code:`readfile` :code:`writefile`
         * VTable: :code:`fsdir`
 
     * - fuzzer
@@ -194,7 +190,7 @@ Extensions
       - `link <https://sqlite.org/src/file?ci=trunk&name=ext%2fmisc%2fieee754.c>`__
       - functions for the exact display* and input of IEEE754 Binary64 floating-point numbers
       -
-        * Function: :code:`ieee754` :code:`ieee754_exponent` :code:`ieee754_from_blob` :code:`ieee754_from_int` :code:`ieee754_inc` :code:`ieee754_mantissa` :code:`ieee754_to_blob` :code:`ieee754_to_int`
+        * Function: :code:`ieee754` :code:`ieee754_exponent` :code:`ieee754_from_blob` :code:`ieee754_inc` :code:`ieee754_mantissa` :code:`ieee754_to_blob`
 
     * - memstat
       - `link <https://sqlite.org/memstat.html>`__
@@ -259,6 +255,12 @@ Extensions
         * Function: :code:`editdist3` :code:`spellfix1_editdist` :code:`spellfix1_phonehash` :code:`spellfix1_scriptcode` :code:`spellfix1_translit`
         * VTable: :code:`spellfix1`
 
+    * - sqlar
+      - `link <https://sqlite.org/sqlar.html#managing_sqlite_archives_from_application_code>`__
+      - Utility functions for SQL archives
+      -
+        * Function: :code:`sqlar_compress` :code:`sqlar_uncompress`
+
     * - stmt
       - `link <https://sqlite.org/stmt.html>`__
       - Virtual table with information about all prepared statements on a connection
@@ -271,12 +273,6 @@ Extensions
       -
         * Function: :code:`stmtrand`
 
-    * - tmstmpvfs
-      - `link <https://sqlite.org/src/file?ci=trunk&name=ext%2fmisc%2ftmstmpvfs.c>`__
-      - VFS shim that writes timestamps and other tracing information to the reserved bytes of each page, and also generates corresponding log files
-      -
-        * VFS: :code:`tmstmpvfs`
-
     * - uint
       - `link <https://sqlite.org/src/file?ci=trunk&name=ext%2fmisc%2fuint.c>`__
       - UINT collating sequence

tools/vend.py

@@ -168,6 +168,12 @@ def __post_init__(self):
         description="Search a large vocabulary for close matches",
         doc="spellfix1.html",
     ),
+    Extra(
+        name="sqlar",
+        description="Utility functions for SQL archives",
+        doc="sqlar.html#managing_sqlite_archives_from_application_code",
+        lib_zlib=True,
+    ),
     Extra(
         name="stmt",
         description="Virtual table with information about all prepared statements on a connection",
@@ -177,10 +183,6 @@ def __post_init__(self):
         name="stmtrand",
         description="Function that returns the same sequence of random integers is returned for each invocation of the statement",
     ),
-    Extra(
-        name="tmstmpvfs",
-        description="VFS shim that writes timestamps and other tracing information to the reserved bytes of each page, and also generates corresponding log files",
-    ),
     # totype: hard codes byte order detection on processors from 2013
     Extra(
         name="uint",
@@ -348,26 +350,31 @@ def __post_init__(self):
         description="Shows contents of stat4 index of a database",
         lib_sqlite=True,
     ),
-    Extra(
-        name="sqlite3_showtmlog",
-        type="executable",
-        sources=["tool/showtmlog.c"],
-        description="Makes human/csv readable output from a tmstmpvfs log file",
-    ),
     Extra(
         name="sqlite3_showwal",
         type="executable",
         sources=["tool/showwal.c"],
         description="Shows low level content of a WAL file",
     ),
     Extra(
-        name="sqlar",
+        name="sqlite3_sqlar",
         type="executable",
         sources=["sqlar/sqlar.c"],
         doc="sqlar/",
         description="Command line SQL archive tool",
         lib_sqlite=True,
     ),
+    # these two are in the withdrawn 3.52.0 release
+    #Extra(
+    #    name="sqlite3_showtmlog",
+    #    type="executable",
+    #    sources=["tool/showtmlog.c"],
+    #    description="Makes human/csv readable output from a tmstmpvfs log file",
+    #),
+    #Extra(
+    #    name="tmstmpvfs",
+    #    description="VFS shim that writes timestamps and other tracing information to the reserved bytes of each page, and also generates corresponding log files",
+    #),
 ]
 
 import os