Prepare release of wxSQLite3 4.10.7

- Upgrade to SQLite3 Multiple Ciphers version 2.1.2 (SQLite version 3.50.0)
- Add method wxSQLite3Database::SetLockTimeout()

Author: utelle

CHANGELOG.md

@@ -7,11 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [4.10.7] - 2025-06-01
+
+  - Upgrade to SQLite3 Multiple Ciphers version 2.1.2 (SQLite version 3.50.0)
+  - Add method wxSQLite3Database::SetLockTimeout()
+
 ## [4.10.6] - 2025-05-05
 
-  - Add method wxSQLite3Database::Configure()<br>
+  - Add method wxSQLite3Database::Configure()
   - Add missing wxSQLite3Database::Restore() method variant
-  - Fix mapping between cipher ids and cipher names<br>
+  - Fix mapping between cipher ids and cipher names
 
 ## [4.10.5] - 2025-03-04
 
@@ -677,7 +682,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - First public release
 
-[Unreleased]: ../../compare/v4.10.6...HEAD
+[Unreleased]: ../../compare/v4.10.7...HEAD
+[4.10.7]: ../../compare/v4.10.6...v4.10.7
 [4.10.6]: ../../compare/v4.10.5...v4.10.6
 [4.10.5]: ../../compare/v4.10.4...v4.10.5
 [4.10.4]: ../../compare/v4.10.3...v4.10.4

configure.ac

@@ -4,7 +4,7 @@ dnl Copyright (C) 2017-2025 Ulrich Telle <github@telle-online.de>, Vadim Zeitlin
 dnl
 dnl This file is covered by the same licence as the entire wxSQLite3 package.
 
-AC_INIT([wxsqlite3], [4.10.6], [github@telle-online.de])
+AC_INIT([wxsqlite3], [4.10.7], [github@telle-online.de])
 
 dnl This is the version tested with, might work with earlier ones.
 AC_PREREQ([2.69])

docs/Doxyfile

@@ -48,7 +48,7 @@ PROJECT_NAME           = wxSQLite3
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 4.10.6
+PROJECT_NUMBER         = 4.10.7
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewers a

include/wx/wxsqlite3.h

@@ -3,7 +3,7 @@
 ** Purpose:     wxWidgets wrapper around the SQLite3 embedded database library.
 ** Author:      Ulrich Telle
 ** Created:     2005-07-14
-** Copyright:   (c) 2005-2024 Ulrich Telle
+** Copyright:   (c) 2005-2025 Ulrich Telle
 ** License:     LGPL-3.0+ WITH WxWindows-exception-3.1
 */
 
@@ -3487,6 +3487,33 @@ class WXDLLIMPEXP_SQLITE3 wxSQLite3Database
   */
   void SetBusyTimeout(int milliSeconds);
 
+  /// Set the setlk timeout
+  /**
+  * This method sets a setlk timeout in ms used by eligible locks taken on wal mode databases
+  * by the specified database handle, if the VFS supports blocking locks. If the VFS does not
+  * support blocking locks, this function is a no-op.
+  *
+  * Passing 0 to this function disables blocking locks altogether. Passing -1 to this function
+  * requests that the VFS blocks for a long time - indefinitely if possible. The results of
+  * passing any other negative value are undefined.
+  *
+  * Internally, each SQLite database handle stores two timeout values - the busy-timeout
+  * (used for rollback mode databases, or if the VFS does not support blocking locks) and
+  * the setlk-timeout (used for blocking locks on wal-mode databases). The method
+  * SetBusyTimeout() sets both values, while this method sets only the setlk-timeout value.
+  * Therefore, to configure separate busy-timeout and setlk-timeout values for a single database
+  * handle, call SetBusyTimeout() followed by this method.
+  *
+  * Whenever the number of connections to a wal mode database falls from 1 to 0, the last
+  * connection takes an exclusive lock on the database, then checkpoints and deletes the wal file.
+  * While it is doing this, any new connection that tries to read from the database fails with an
+  * SQLITE_BUSY error. Or, if the blockOnConnect flag is true, the new connection blocks until
+  * the exclusive lock has been released. 
+  * \param milliSeconds timeout in milliseconds
+  * \param blockOnConnect flag whether new connections should block until exclusive lock has been released
+  */
+  void SetLockTimeout(int milliSeconds, bool blockOnConnect = false);
+
   /// Set a database configuration option
   /**
   * This method allows to configure several database settings. Most settings can be changed
@@ -4027,7 +4054,7 @@ class WXDLLIMPEXP_SQLITE3 wxSQLite3Database
 
   wxSQLite3DatabaseReference* m_db;  ///< associated SQLite3 database
   bool  m_isOpen;          ///< Flag whether the database is opened or not
-  int   m_busyTimeoutMs;   ///< Timeout in milli seconds
+  int   m_busyTimeoutMs;   ///< Busy timeout in milli seconds
   bool  m_isEncrypted;     ///< Flag whether the database is encrypted or not
   int   m_lastRollbackRC;  ///< The return code of the last executed rollback operation
   int   m_backupPageCount; ///< Number of pages per slice for backup and restore operations

include/wx/wxsqlite3_version.h

@@ -14,8 +14,8 @@
 
 #define WXSQLITE3_MAJOR_VERSION      4
 #define WXSQLITE3_MINOR_VERSION      10
-#define WXSQLITE3_RELEASE_NUMBER     6
+#define WXSQLITE3_RELEASE_NUMBER     7
 #define WXSQLITE3_SUBRELEASE_NUMBER  0
-#define WXSQLITE3_VERSION_STRING     "wxSQLite3 4.10.6"
+#define WXSQLITE3_VERSION_STRING     "wxSQLite3 4.10.7"
 
 #endif // WXSQLITE3_VERSION_H_

include/wx/wxsqlite3def.h

@@ -46,6 +46,13 @@
 
 <dl>
 
+<dt><b>4.10.7</b> - <i>June 2025</i></dt>
+<dd>
+Upgrade to <i>SQLite3 Multiple Ciphers version 2.1.2 (SQLite version 3.50.0)</i><br>
+Add method wxSQLite3Database::SetLockTimeout()
+
+</dd>
+
 <dt><b>4.10.6</b> - <i>May 2025</i></dt>
 <dd>
 Add method wxSQLite3Database::Configure()<br>

readme.md

@@ -52,11 +52,10 @@ Currently the _CMake_ support is experimental and limited to Windows platforms (
 
 ## <a name="history"></a>Version history
 
-* 4.10.6 - *May 2025*
+* 4.10.7 - *June 2025*
 
-  - Add method wxSQLite3Database::Configure()<br>
-  - Add missing wxSQLite3Database::Restore() method variant
-  - Fix mapping between cipher ids and cipher names<br>
+  - Upgrade to SQLite3 Multiple Ciphers version 2.1.2 (SQLite version 3.50.0)
+  - Add method wxSQLite3Database::SetLockTimeout()
 
 For further version information please consult the [CHANGELOG](CHANGELOG.md).