Skip to content

Commit 9326dc3

Browse files
committed
Preparation of release of wxSQLite3 version 3.5.5
1 parent 6a11e0c commit 9326dc3

File tree

9 files changed

+35
-22
lines changed

9 files changed

+35
-22
lines changed

docs/Doxyfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ PROJECT_NAME = wxSQLite3
3838
# could be handy for archiving the generated documentation or if some version
3939
# control system is used.
4040

41-
PROJECT_NUMBER = 3.5.4
41+
PROJECT_NUMBER = 3.5.5
4242

4343
# Using the PROJECT_BRIEF tag one can provide an optional one line description
4444
# for a project that appears at the top of each page and should give viewer a

include/wx/wxsqlite3_version.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212

1313
#define WXSQLITE3_MAJOR_VERSION 3
1414
#define WXSQLITE3_MINOR_VERSION 5
15-
#define WXSQLITE3_RELEASE_NUMBER 4
15+
#define WXSQLITE3_RELEASE_NUMBER 5
1616
#define WXSQLITE3_SUBRELEASE_NUMBER 0
17-
#define WXSQLITE3_VERSION_STRING "wxSQLite3 3.5.4"
17+
#define WXSQLITE3_VERSION_STRING "wxSQLite3 3.5.5"
1818

1919
#endif // _WXSQLITE3_VERSION_H_

include/wx/wxsqlite3def.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,11 @@
4646
4747
<dl>
4848
49+
<dt><b>3.5.5</b> - <i>June 2017</i></dt>
50+
<dd>
51+
Upgrade to SQLite version 3.19.3<br>
52+
53+
</dd>
4954
<dt><b>3.5.4</b> - <i>June 2017</i></dt>
5055
<dd>
5156
Upgrade to SQLite version 3.19.2<br>

readme.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ tools operate in Unicode or UTF-8 mode.
2525

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

28+
* 3.5.5 - *June 2017*
29+
- Upgrade to SQLite version 3.19.3
2830
* 3.5.4 - *June 2017*
2931
- Upgrade to SQLite version 3.19.2
3032
* 3.5.3 - *March 2017*

sqlite3/Readme.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
This directory contains all SQLite3 version 3.19.2 files needed on
1+
This directory contains all SQLite3 version 3.19.3 files needed on
22
Windows platforms.
33

44
For the version with encryption support (AES-128 or AES-256) the

sqlite3/secure/src/sqlite3.c

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/******************************************************************************
22
** This file is an amalgamation of many separate C source files from SQLite
3-
** version 3.19.2. By combining all the individual C code files into this
3+
** version 3.19.3. By combining all the individual C code files into this
44
** single large file, the entire code can be compiled as a single translation
55
** unit. This allows many compilers to do optimizations that would not be
66
** possible if the files were compiled separately. Performance improvements
@@ -398,9 +398,9 @@ extern "C" {
398398
** [sqlite3_libversion_number()], [sqlite3_sourceid()],
399399
** [sqlite_version()] and [sqlite_source_id()].
400400
*/
401-
#define SQLITE_VERSION "3.19.2"
402-
#define SQLITE_VERSION_NUMBER 3019002
403-
#define SQLITE_SOURCE_ID "2017-05-25 16:50:27 edb4e819b0c058c7d74d27ebd14cc5ceb2bad6a6144a486a970182b7afe3f8b9"
401+
#define SQLITE_VERSION "3.19.3"
402+
#define SQLITE_VERSION_NUMBER 3019003
403+
#define SQLITE_SOURCE_ID "2017-06-08 14:26:16 0ee482a1e0eae22e08edc8978c9733a96603d4509645f348ebf55b579e89636b"
404404

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

199062199068
static int fts5Init(sqlite3 *db){

sqlite3/secure/src/sqlite3.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,9 @@ extern "C" {
121121
** [sqlite3_libversion_number()], [sqlite3_sourceid()],
122122
** [sqlite_version()] and [sqlite_source_id()].
123123
*/
124-
#define SQLITE_VERSION "3.19.2"
125-
#define SQLITE_VERSION_NUMBER 3019002
126-
#define SQLITE_SOURCE_ID "2017-05-25 16:50:27 edb4e819b0c058c7d74d27ebd14cc5ceb2bad6a6144a486a970182b7afe3f8b9"
124+
#define SQLITE_VERSION "3.19.3"
125+
#define SQLITE_VERSION_NUMBER 3019003
126+
#define SQLITE_SOURCE_ID "2017-06-08 14:26:16 0ee482a1e0eae22e08edc8978c9733a96603d4509645f348ebf55b579e89636b"
127127

128128
/*
129129
** CAPI3REF: Run-Time Library Version Numbers

sqlite3/secure/src/sqlite3.rc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#include <windows.h>
55

66
VS_VERSION_INFO VERSIONINFO
7-
FILEVERSION 3,19,2,1
8-
PRODUCTVERSION 3,19,2,1
7+
FILEVERSION 3,19,3,1
8+
PRODUCTVERSION 3,19,3,1
99
FILEFLAGSMASK 0x3fL
1010
#ifdef _DEBUG
1111
FILEFLAGS 0x1L
@@ -22,12 +22,12 @@ BEGIN
2222
BEGIN
2323
VALUE "CompanyName", "SQLite"
2424
VALUE "FileDescription", "SQLite3 Database Library (with encryption support)"
25-
VALUE "FileVersion", "3.19.2.1"
25+
VALUE "FileVersion", "3.19.3.1"
2626
VALUE "InternalName", "sqlite3.dll"
2727
VALUE "LegalCopyright", "Public Domain"
2828
VALUE "OriginalFilename", "sqlite3.dll"
2929
VALUE "ProductName", "SQLite3"
30-
VALUE "ProductVersion", "3.19.2.1"
30+
VALUE "ProductVersion", "3.19.3.1"
3131
END
3232
END
3333
BLOCK "VarFileInfo"

sqlite3/secure/src/sqlite3shell.rc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#include <windows.h>
55

66
VS_VERSION_INFO VERSIONINFO
7-
FILEVERSION 3,19,2,1
8-
PRODUCTVERSION 3,19,2,1
7+
FILEVERSION 3,19,3,1
8+
PRODUCTVERSION 3,19,3,1
99
FILEFLAGSMASK 0x3fL
1010
#ifdef _DEBUG
1111
FILEFLAGS 0x1L
@@ -22,12 +22,12 @@ BEGIN
2222
BEGIN
2323
VALUE "CompanyName", "SQLite"
2424
VALUE "FileDescription", "SQLite3 Database Shell (with encryption support)"
25-
VALUE "FileVersion", "3.19.2.1"
25+
VALUE "FileVersion", "3.19.3.1"
2626
VALUE "InternalName", "sqlite3shell.exe"
2727
VALUE "LegalCopyright", "Public Domain"
2828
VALUE "OriginalFilename", "sqlite3shell.exe"
2929
VALUE "ProductName", "SQLite3"
30-
VALUE "ProductVersion", "3.19.2.1"
30+
VALUE "ProductVersion", "3.19.3.1"
3131
END
3232
END
3333
BLOCK "VarFileInfo"

0 commit comments

Comments
 (0)