Prepare release of wxSQLite3 4.9.2

- Upgrade to SQLite3 Multiple Ciphers 1.6.0 (based on SQLite 3.41.0)
- Enhance method wxSQLite3Database::Open allowing to set the VFS to be used
- Add method wxSQLite3Database::IsInterrupted

configure.ac

@@ -4,7 +4,7 @@ dnl Copyright (C) 2017-2022 Ulrich Telle <[email protected]>, Vadim Zeitlin
 dnl
 dnl This file is covered by the same licence as the entire wxSQLite3 package.
 
-AC_INIT([wxsqlite3], [4.9.1], [[email protected]])
+AC_INIT([wxsqlite3], [4.9.2], [[email protected]])
 
 dnl This is the version tested with, might work with earlier ones.
 AC_PREREQ([2.69])

docs/Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = wxSQLite3
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 4.9.1
+PROJECT_NUMBER         = 4.9.2
 
 # 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 viewer 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-2022 Ulrich Telle
+** Copyright:   (c) 2005-2023 Ulrich Telle
 ** License:     LGPL-3.0+ WITH WxWindows-exception-3.1
 */
 
@@ -2585,9 +2585,13 @@ class WXDLLIMPEXP_SQLITE3 wxSQLite3Database
   * \param[in] key Database encryption key.
   * \param[in] flags Control over the database connection (see http://www.sqlite.org/c3ref/open.html for further information).
   * Flag values are prefixed by WX to distinguish them from the original SQLite flag values.
+  * \param[in] vfs Name of VFS to be used.
+  * Use the VFS name prefix "multipleciphers-" to enable encryption support.
+  * An empty VFS name refers to the default VFS.
   */
   void Open(const wxString& fileName, const wxString& key = wxEmptyString,
-            int flags = WXSQLITE_OPEN_READWRITE | WXSQLITE_OPEN_CREATE);
+            int flags = WXSQLITE_OPEN_READWRITE | WXSQLITE_OPEN_CREATE,
+            const wxString& vfs = wxEmptyString);
 
   /// Open a SQLite3 database using a binary key
   /**
@@ -2598,9 +2602,13 @@ class WXDLLIMPEXP_SQLITE3 wxSQLite3Database
   * \param[in] key Database encryption key.
   * \param[in] flags Control over the database connection (see http://www.sqlite.org/c3ref/open.html for further information).
   * Flag values are prefixed by WX to distinguish them from the original SQLite flag values.
+  * \param[in] vfs Name of VFS to be used.
+  * Use the VFS name prefix "multipleciphers-" to enable encryption support.
+  * An empty VFS name refers to the default VFS.
   */
   void Open(const wxString& fileName, const wxMemoryBuffer& key,
-            int flags = WXSQLITE_OPEN_READWRITE | WXSQLITE_OPEN_CREATE);
+            int flags = WXSQLITE_OPEN_READWRITE | WXSQLITE_OPEN_CREATE,
+            const wxString& vfs = wxEmptyString);
 
   /// Open a SQLite3 database
   /**
@@ -2612,9 +2620,13 @@ class WXDLLIMPEXP_SQLITE3 wxSQLite3Database
   * \param[in] key Database encryption key.
   * \param[in] flags Control over the database connection (see http://www.sqlite.org/c3ref/open.html for further information).
   * Flag values are prefixed by WX to distinguish them from the original SQLite flag values.
+  * \param[in] vfs Name of VFS to be used.
+  * Use the VFS name prefix "multipleciphers-" to enable encryption support.
+  * An empty VFS name refers to the default VFS.
   */
   void Open(const wxString& fileName, const wxSQLite3Cipher& cipher, const wxString& key,
-            int flags = WXSQLITE_OPEN_READWRITE | WXSQLITE_OPEN_CREATE);
+            int flags = WXSQLITE_OPEN_READWRITE | WXSQLITE_OPEN_CREATE,
+            const wxString& vfs = wxEmptyString);
 
   /// Open a SQLite3 database using a binary key
   /**
@@ -2626,9 +2638,13 @@ class WXDLLIMPEXP_SQLITE3 wxSQLite3Database
   * \param[in] key Database encryption key.
   * \param[in] flags Control over the database connection (see http://www.sqlite.org/c3ref/open.html for further information).
   * Flag values are prefixed by WX to distinguish them from the original SQLite flag values.
+  * \param[in] vfs Name of VFS to be used.
+  * Use the VFS name prefix "multipleciphers-" to enable encryption support.
+  * An empty VFS name refers to the default VFS.
   */
   void Open(const wxString& fileName, const wxSQLite3Cipher& cipher, const wxMemoryBuffer& key,
-            int flags = WXSQLITE_OPEN_READWRITE | WXSQLITE_OPEN_CREATE);
+            int flags = WXSQLITE_OPEN_READWRITE | WXSQLITE_OPEN_CREATE,
+            const wxString& vfs = wxEmptyString);
 
   /// Check whether the database has been opened
   /**
@@ -3260,6 +3276,12 @@ class WXDLLIMPEXP_SQLITE3 wxSQLite3Database
   */
   void Interrupt();
 
+  /// Determine whether or not an interrupt is currently in effect
+  /**
+  * \return TRUE if an interrupt is in effect, FALSE otherwise.
+  */
+  bool IsInterrupted();
+
   /// Set the busy timeout
   /**
   * This method sets a busy handler that sleeps for a while when a table is locked.

include/wx/wxsqlite3_version.h

@@ -3,7 +3,7 @@
 ** Purpose:     wxSQLite3 version numbers
 ** Author:      Ulrich Telle
 ** Created:     2017-02-01
-** Copyright:   (c) 2017-2022 Ulrich Telle
+** Copyright:   (c) 2017-2023 Ulrich Telle
 ** License:     LGPL-3.0+ WITH WxWindows-exception-3.1
 */
 
@@ -14,8 +14,8 @@
 
 #define WXSQLITE3_MAJOR_VERSION      4
 #define WXSQLITE3_MINOR_VERSION      9
-#define WXSQLITE3_RELEASE_NUMBER     1
+#define WXSQLITE3_RELEASE_NUMBER     2
 #define WXSQLITE3_SUBRELEASE_NUMBER  0
-#define WXSQLITE3_VERSION_STRING     "wxSQLite3 4.9.1"
+#define WXSQLITE3_VERSION_STRING     "wxSQLite3 4.9.2"
 
 #endif // WXSQLITE3_VERSION_H_

include/wx/wxsqlite3def.h

@@ -3,7 +3,7 @@
 ** Purpose:     wxWidgets wrapper around the SQLite3 embedded database library.
 ** Author:      Ulrich Telle
 ** Created:     2005-07-14
-** Copyright:   (c) 2005-2022 Ulrich Telle
+** Copyright:   (c) 2005-2023 Ulrich Telle
 ** License:     LGPL-3.0+ WITH WxWindows-exception-3.1
 */
 
@@ -46,6 +46,14 @@
 
 <dl>
 
+<dt><b>4.9.2</b> - <i>February 2023</i></dt>
+<dd>
+Upgrade to <i>SQLite3 Multiple Ciphers version 1.6.0 (SQLite version 3.41.0)</i><br>
+Enhanced method wxSQLite3Database::Open allowing to set the VFS to be used<br>
+Added method wxSQLite3Database::IsInterrupted<br>
+
+</dd>
+
 <dt><b>4.9.1</b> - <i>November 2022</i></dt>
 <dd>
 Upgrade to <i>SQLite3 Multiple Ciphers version 1.5.4 (SQLite version 3.40.0)</i><br>

readme.md

@@ -48,6 +48,11 @@ Since August 2020 a new implementation of an encryption extension, capable of su
 
 ## <a name="history"></a>Version history
 
+* 4.9.2 - *February 2023*
+  - Upgrade to SQLite3 Multiple Ciphers version 1.6.0 (SQLite version 3.41.0)
+  - Enhanced method wxSQLite3Database::Open allowing to set the VFS to be used
+  - Added method wxSQLite3Database::IsInterrupted
+
 * 4.9.1 - *November 2022*
   - Upgrade to SQLite3 Multiple Ciphers version 1.5.4 (SQLite version 3.40.0)
 * 4.9.0 - *September 2022*