Skip to content

Commit

Permalink
Preparation of release of wxSQLite3 version 3.5.5
Browse files Browse the repository at this point in the history
  • Loading branch information
utelle committed Jun 9, 2017
1 parent 6a11e0c commit 9326dc3
Show file tree
Hide file tree
Showing 9 changed files with 35 additions and 22 deletions.
2 changes: 1 addition & 1 deletion docs/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 = 3.5.4
PROJECT_NUMBER = 3.5.5

# 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
Expand Down
4 changes: 2 additions & 2 deletions include/wx/wxsqlite3_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

#define WXSQLITE3_MAJOR_VERSION 3
#define WXSQLITE3_MINOR_VERSION 5
#define WXSQLITE3_RELEASE_NUMBER 4
#define WXSQLITE3_RELEASE_NUMBER 5
#define WXSQLITE3_SUBRELEASE_NUMBER 0
#define WXSQLITE3_VERSION_STRING "wxSQLite3 3.5.4"
#define WXSQLITE3_VERSION_STRING "wxSQLite3 3.5.5"

#endif // _WXSQLITE3_VERSION_H_
5 changes: 5 additions & 0 deletions include/wx/wxsqlite3def.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,11 @@
<dl>
<dt><b>3.5.5</b> - <i>June 2017</i></dt>
<dd>
Upgrade to SQLite version 3.19.3<br>
</dd>
<dt><b>3.5.4</b> - <i>June 2017</i></dt>
<dd>
Upgrade to SQLite version 3.19.2<br>
Expand Down
2 changes: 2 additions & 0 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ tools operate in Unicode or UTF-8 mode.

## <a name="history"></a>Version history

* 3.5.5 - *June 2017*
- Upgrade to SQLite version 3.19.3
* 3.5.4 - *June 2017*
- Upgrade to SQLite version 3.19.2
* 3.5.3 - *March 2017*
Expand Down
2 changes: 1 addition & 1 deletion sqlite3/Readme.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
This directory contains all SQLite3 version 3.19.2 files needed on
This directory contains all SQLite3 version 3.19.3 files needed on
Windows platforms.

For the version with encryption support (AES-128 or AES-256) the
Expand Down
20 changes: 13 additions & 7 deletions sqlite3/secure/src/sqlite3.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/******************************************************************************
** This file is an amalgamation of many separate C source files from SQLite
** version 3.19.2. By combining all the individual C code files into this
** version 3.19.3. By combining all the individual C code files into this
** single large file, the entire code can be compiled as a single translation
** unit. This allows many compilers to do optimizations that would not be
** possible if the files were compiled separately. Performance improvements
Expand Down Expand Up @@ -398,9 +398,9 @@ extern "C" {
** [sqlite3_libversion_number()], [sqlite3_sourceid()],
** [sqlite_version()] and [sqlite_source_id()].
*/
#define SQLITE_VERSION "3.19.2"
#define SQLITE_VERSION_NUMBER 3019002
#define SQLITE_SOURCE_ID "2017-05-25 16:50:27 edb4e819b0c058c7d74d27ebd14cc5ceb2bad6a6144a486a970182b7afe3f8b9"
#define SQLITE_VERSION "3.19.3"
#define SQLITE_VERSION_NUMBER 3019003
#define SQLITE_SOURCE_ID "2017-06-08 14:26:16 0ee482a1e0eae22e08edc8978c9733a96603d4509645f348ebf55b579e89636b"

/*
** CAPI3REF: Run-Time Library Version Numbers
Expand Down Expand Up @@ -67208,12 +67208,18 @@ SQLITE_PRIVATE int sqlite3BtreeInsert(
memcpy(newCell, oldCell, 4);
}
rc = clearCell(pPage, oldCell, &info);
if( info.nSize==szNew && info.nLocal==info.nPayload ){
if( info.nSize==szNew && info.nLocal==info.nPayload
&& (!ISAUTOVACUUM || szNew<pPage->minLocal)
){
/* Overwrite the old cell with the new if they are the same size.
** We could also try to do this if the old cell is smaller, then add
** the leftover space to the free list. But experiments show that
** doing that is no faster then skipping this optimization and just
** calling dropCell() and insertCell(). */
** calling dropCell() and insertCell().
**
** This optimization cannot be used on an autovacuum database if the
** new entry uses overflow pages, as the insertCell() call below is
** necessary to add the PTRMAP_OVERFLOW1 pointer-map entry. */
assert( rc==SQLITE_OK ); /* clearCell never fails when nLocal==nPayload */
if( oldCell+szNew > pPage->aDataEnd ) return SQLITE_CORRUPT_BKPT;
memcpy(oldCell, newCell, szNew);
Expand Down Expand Up @@ -199056,7 +199062,7 @@ static void fts5SourceIdFunc(
){
assert( nArg==0 );
UNUSED_PARAM2(nArg, apUnused);
sqlite3_result_text(pCtx, "fts5: 2017-05-25 16:50:27 edb4e819b0c058c7d74d27ebd14cc5ceb2bad6a6144a486a970182b7afe3f8b9", -1, SQLITE_TRANSIENT);
sqlite3_result_text(pCtx, "fts5: 2017-06-08 14:26:16 0ee482a1e0eae22e08edc8978c9733a96603d4509645f348ebf55b579e89636b", -1, SQLITE_TRANSIENT);
}

static int fts5Init(sqlite3 *db){
Expand Down
6 changes: 3 additions & 3 deletions sqlite3/secure/src/sqlite3.h
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,9 @@ extern "C" {
** [sqlite3_libversion_number()], [sqlite3_sourceid()],
** [sqlite_version()] and [sqlite_source_id()].
*/
#define SQLITE_VERSION "3.19.2"
#define SQLITE_VERSION_NUMBER 3019002
#define SQLITE_SOURCE_ID "2017-05-25 16:50:27 edb4e819b0c058c7d74d27ebd14cc5ceb2bad6a6144a486a970182b7afe3f8b9"
#define SQLITE_VERSION "3.19.3"
#define SQLITE_VERSION_NUMBER 3019003
#define SQLITE_SOURCE_ID "2017-06-08 14:26:16 0ee482a1e0eae22e08edc8978c9733a96603d4509645f348ebf55b579e89636b"

/*
** CAPI3REF: Run-Time Library Version Numbers
Expand Down
8 changes: 4 additions & 4 deletions sqlite3/secure/src/sqlite3.rc
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#include <windows.h>

VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,19,2,1
PRODUCTVERSION 3,19,2,1
FILEVERSION 3,19,3,1
PRODUCTVERSION 3,19,3,1
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -22,12 +22,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "SQLite"
VALUE "FileDescription", "SQLite3 Database Library (with encryption support)"
VALUE "FileVersion", "3.19.2.1"
VALUE "FileVersion", "3.19.3.1"
VALUE "InternalName", "sqlite3.dll"
VALUE "LegalCopyright", "Public Domain"
VALUE "OriginalFilename", "sqlite3.dll"
VALUE "ProductName", "SQLite3"
VALUE "ProductVersion", "3.19.2.1"
VALUE "ProductVersion", "3.19.3.1"
END
END
BLOCK "VarFileInfo"
Expand Down
8 changes: 4 additions & 4 deletions sqlite3/secure/src/sqlite3shell.rc
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#include <windows.h>

VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,19,2,1
PRODUCTVERSION 3,19,2,1
FILEVERSION 3,19,3,1
PRODUCTVERSION 3,19,3,1
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -22,12 +22,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "SQLite"
VALUE "FileDescription", "SQLite3 Database Shell (with encryption support)"
VALUE "FileVersion", "3.19.2.1"
VALUE "FileVersion", "3.19.3.1"
VALUE "InternalName", "sqlite3shell.exe"
VALUE "LegalCopyright", "Public Domain"
VALUE "OriginalFilename", "sqlite3shell.exe"
VALUE "ProductName", "SQLite3"
VALUE "ProductVersion", "3.19.2.1"
VALUE "ProductVersion", "3.19.3.1"
END
END
BLOCK "VarFileInfo"
Expand Down

0 comments on commit 9326dc3

Please sign in to comment.