Update recommended compile options

Fixes #596

Author: rogerbinns

apsw/tests/__main__.py

@@ -12104,11 +12104,7 @@ def setup():
     try:
         apsw.config(apsw.SQLITE_CONFIG_MEMSTATUS, True)  # ensure memory tracking is on
     except apsw.MisuseError:
-        # if using amalgamation then something went wrong
-        if apsw.using_amalgamation:
-            raise
-        # coverage uses sqlite and so the config call is too
-        # late
+        # sqlite was already initialized
         pass
     apsw.initialize()  # manual call for coverage
     memdb = apsw.Connection(":memory:")

doc/changes.rst

@@ -14,7 +14,7 @@ APSW changes by version
 ========
 
 Comprehensive async support - connections run in a dedicated worker
-with the event loop able to :code:`await` the results.
+thread with the event loop able to :code:`await` the results.
 
   * :mod:`asyncio`, |trio|, and |anyio| are supported and tested
   * Async callbacks can be used anywhere including:
@@ -60,6 +60,28 @@ and right align integers.  That updates the :doc:`shell <shell>` output.
 Update :func:`fork_checker` and :func:`shutdown` for more robustness
 (:issue:`602`)
 
+Amalgamation builds **only** (eg PyPI):  Following the `recommended
+compile time options
+<https://sqlite.org/compile.html#recommended_compile_time_options>`__,
+the following options are now set.  Other applicable recommendations
+were done in earlier releases.  You can use
+:attr:`apsw.compile_options` to see what is in effect.
+
+* `SQLITE_OMIT_AUTOINIT
+  <https://sqlite.org/compile.html#omit_autoinit>`__.
+  :func:`initialize` is called when APSW is loaded.  **Backwards
+  incompatible change:** This will only affect :func:`apsw.config` calls
+  made before anything else, and will now require an explicit :func:`apsw.shutdown`,
+  :func:`apsw.config`, and :func:`apsw.initialize`.
+
+* `SQLITE_STRICT_SUBTYPE <https://sqlite.org/compile.html#strict_subtype>`__ -
+  subtypes are not exposed in APSW, but are used by SQLite builtin functions.
+
+* `SQLITE_LIKE_DOESNT_MATCH_BLOBS
+  <https://sqlite.org/compile.html#like_doesnt_match_blobs>`__ which
+  is a **backwards incompatible change** if you deliberately use
+  :code:`LIKE` against blobs, which is not a good idea.
+
 Take advantage of :code:`SQLITE_UTF8_ZT` encoding and
 `sqlite3_carray_bind_v2
 <https://sqlite.org/draft/c3ref/carray_bind.html>`__ in the C code.

src/apsw.c

@@ -86,6 +86,18 @@ API Reference
 #define SQLITE_ENABLE_SETLK_TIMEOUT 1
 #endif
 
+#ifndef SQLITE_OMIT_AUTOINIT
+#define SQLITE_OMIT_AUTOINIT 1
+#endif
+
+#ifndef SQLITE_STRICT_SUBTYPE
+#define SQLITE_STRICT_SUBTYPE 1
+#endif
+
+#ifndef SQLITE_LIKE_DOESNT_MATCH_BLOBS
+#define SQLITE_LIKE_DOESNT_MATCH_BLOBS 1
+#endif
+
 #ifndef SQLITE_DEBUG
 #define SQLITE_API static
 #define SQLITE_EXTERN static
@@ -2012,6 +2024,18 @@ PyInit_apsw(void)
     PyErr_Format(PyExc_EnvironmentError, "SQLite was compiled without thread safety and cannot be used.");
     goto fail;
   }
+
+#ifdef APSW_USE_SQLITE_AMALGAMATION
+  {
+    int rc = sqlite3_initialize();
+    if (rc != SQLITE_OK)
+    {
+      PyErr_Format(PyExc_RuntimeError, "SQLite failed to initialize with code %d", rc);
+      goto fail;
+    }
+  }
+#endif
+
   module_is_initialized = 0;
   if (ApswModuleType.tp_base == NULL)
   {