Skip to content

Commit c5735c8

Browse files
committed
Prepare release of version 1.6.4
- Based on SQLite version 3.43.0
1 parent ea816b0 commit c5735c8

File tree

14 files changed

+11836
-4816
lines changed

14 files changed

+11836
-4816
lines changed

CHANGELOG.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [1.6.4] - 2023-08-25
11+
12+
### Changed
13+
14+
- Based on SQLite version 3.43.0
15+
1016
## [1.6.3] - 2023-05-18
1117

1218
### Changed
@@ -391,7 +397,8 @@ The following ciphers are supported:
391397
- AES 256 Bit CBC - SHA1/SHA256/SHA512 HMAC ([SQLCipher](https://www.zetetic.net/sqlcipher/), database versions 1, 2, 3, and 4)
392398
- RC4 - No HMAC ([System.Data.SQLite](http://system.data.sqlite.org))
393399

394-
[Unreleased]: ../../compare/v1.6.3...HEAD
400+
[Unreleased]: ../../compare/v1.6.4...HEAD
401+
[1.6.4]: ../../compare/v1.6.3...v1.6.4
395402
[1.6.3]: ../../compare/v1.6.2...v1.6.3
396403
[1.6.2]: ../../compare/v1.6.1...v1.6.2
397404
[1.6.1]: ../../compare/v1.6.0...v1.6.1

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ dnl Copyright (C) 2019-2023 Ulrich Telle <[email protected]>
44
dnl
55
dnl This file is covered by the same licence as the entire SQLite3 Multiple Ciphers package.
66

7-
AC_INIT([sqlite3mc], [1.6.3], [[email protected]])
7+
AC_INIT([sqlite3mc], [1.6.4], [[email protected]])
88

99
dnl This is the version tested with, might work with earlier ones.
1010
AC_PREREQ([2.69])

readme.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@ The code was mainly developed under Windows, but was tested under Linux as well.
1010

1111
## Version information
1212

13-
* 1.6.3 - *May 2023*
14-
- Based on SQLite version 3.42.0
15-
- Enabled session extension
16-
- Fixed incorrect patch of SQLite shell source
13+
* 1.6.4 - *August 2023*
14+
- Based on SQLite version 3.43.0
1715

1816
For further version information please consult the [CHANGELOG](CHANGELOG.md).
1917

src/rekeyvacuum.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
** Change 4: Call sqlite3mcBtreeSetPageSize instead of sqlite3BtreeSetPageSize for main database
2828
** (sqlite3mcBtreeSetPageSize allows to reduce the number of reserved bytes)
2929
**
30-
** This code is generated by the script rekeyvacuum.sh from SQLite version 3.42.0 amalgamation.
30+
** This code is generated by the script rekeyvacuum.sh from SQLite version 3.43.0 amalgamation.
3131
*/
3232
SQLITE_PRIVATE SQLITE_NOINLINE int sqlite3mcRunVacuumForRekey(
3333
char **pzErrMsg, /* Write error message here */
@@ -96,7 +96,7 @@ SQLITE_PRIVATE SQLITE_NOINLINE int sqlite3mcRunVacuumForRekey(
9696
** (possibly synchronous) transaction opened on the main database before
9797
** sqlite3BtreeCopyFile() is called.
9898
**
99-
** An optimisation would be to use a non-journaled pager.
99+
** An optimization would be to use a non-journaled pager.
100100
** (Later:) I tried setting "PRAGMA vacuum_db.journal_mode=OFF" but
101101
** that actually made the VACUUM run slower. Very little journalling
102102
** actually occurs when doing a vacuum since the vacuum_db is initially

src/series.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,14 +330,18 @@ static int seriesColumn(
330330
return SQLITE_OK;
331331
}
332332

333+
#ifndef LARGEST_UINT64
334+
#define LARGEST_UINT64 (0xffffffff|(((sqlite3_uint64)0xffffffff)<<32))
335+
#endif
336+
333337
/*
334338
** Return the rowid for the current row, logically equivalent to n+1 where
335339
** "n" is the ascending integer in the aforesaid production definition.
336340
*/
337341
static int seriesRowid(sqlite3_vtab_cursor *cur, sqlite_int64 *pRowid){
338342
series_cursor *pCur = (series_cursor*)cur;
339343
sqlite3_uint64 n = pCur->ss.uSeqIndexNow;
340-
*pRowid = (sqlite3_int64)((n<0xffffffffffffffff)? n+1 : 0);
344+
*pRowid = (sqlite3_int64)((n<LARGEST_UINT64)? n+1 : 0);
341345
return SQLITE_OK;
342346
}
343347

0 commit comments

Comments
 (0)