Skip to content

Commit 5510762

Browse files
committed
Update to sqlite 3.50.2
Signed-off-by: Prabhu Subramanian <[email protected]>
1 parent a003b72 commit 5510762

File tree

7 files changed

+183
-131
lines changed

7 files changed

+183
-131
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Asynchronous, non-blocking [SQLite3](https://sqlite.org/) bindings for [Node.js]
1515
- [Extension support](https://github.com/AppThreat/node-sqlite3/wiki/API#databaseloadextensionpath-callback), including bundled support for the [json1 extension](https://www.sqlite.org/json1.html)
1616
- Big test suite
1717
- Written in modern C++ and tested for memory leaks
18-
- Bundles SQLite v3.50.1, or you can build using a local SQLite [amalgamation](https://www.sqlite.org/amalgamation.html)
18+
- Bundles SQLite v3.50.2, or you can build using a local SQLite [amalgamation](https://www.sqlite.org/amalgamation.html)
1919

2020
# Installing
2121

deps/common-sqlite.gypi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
'variables': {
3-
'sqlite_version%':'3500100',
3+
'sqlite_version%':'3500200',
44
"toolset%":'',
55
},
66
'target_defaults': {

deps/sqlite-amalgamation-3500100/shell.c renamed to deps/sqlite-amalgamation-3500200/shell.c

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8027,13 +8027,14 @@ SQLITE_EXTENSION_INIT1
80278027
# include <dirent.h>
80288028
# include <utime.h>
80298029
# include <sys/time.h>
8030+
# define STRUCT_STAT struct stat
80308031
#else
80318032
# include "windows.h"
80328033
# include <io.h>
80338034
# include <direct.h>
80348035
/* # include "test_windirent.h" */
80358036
# define dirent DIRENT
8036-
# define stat _stat
8037+
# define STRUCT_STAT struct _stat
80378038
# define chmod(path,mode) fileio_chmod(path,mode)
80388039
# define mkdir(path,mode) fileio_mkdir(path)
80398040
#endif
@@ -8224,7 +8225,7 @@ LPWSTR utf8_to_utf16(const char *z){
82248225
*/
82258226
static void statTimesToUtc(
82268227
const char *zPath,
8227-
struct stat *pStatBuf
8228+
STRUCT_STAT *pStatBuf
82288229
){
82298230
HANDLE hFindFile;
82308231
WIN32_FIND_DATAW fd;
@@ -8252,7 +8253,7 @@ static void statTimesToUtc(
82528253
*/
82538254
static int fileStat(
82548255
const char *zPath,
8255-
struct stat *pStatBuf
8256+
STRUCT_STAT *pStatBuf
82568257
){
82578258
#if defined(_WIN32)
82588259
sqlite3_int64 sz = strlen(zPath);
@@ -8276,7 +8277,7 @@ static int fileStat(
82768277
*/
82778278
static int fileLinkStat(
82788279
const char *zPath,
8279-
struct stat *pStatBuf
8280+
STRUCT_STAT *pStatBuf
82808281
){
82818282
#if defined(_WIN32)
82828283
return fileStat(zPath, pStatBuf);
@@ -8309,7 +8310,7 @@ static int makeDirectory(
83098310
int i = 1;
83108311

83118312
while( rc==SQLITE_OK ){
8312-
struct stat sStat;
8313+
STRUCT_STAT sStat;
83138314
int rc2;
83148315

83158316
for(; zCopy[i]!='/' && i<nCopy; i++);
@@ -8359,7 +8360,7 @@ static int writeFile(
83598360
** be an error though - if there is already a directory at the same
83608361
** path and either the permissions already match or can be changed
83618362
** to do so using chmod(), it is not an error. */
8362-
struct stat sStat;
8363+
STRUCT_STAT sStat;
83638364
if( errno!=EEXIST
83648365
|| 0!=fileStat(zFile, &sStat)
83658366
|| !S_ISDIR(sStat.st_mode)
@@ -8561,7 +8562,7 @@ struct fsdir_cursor {
85618562
const char *zBase;
85628563
int nBase;
85638564

8564-
struct stat sStat; /* Current lstat() results */
8565+
STRUCT_STAT sStat; /* Current lstat() results */
85658566
char *zPath; /* Path to current entry */
85668567
sqlite3_int64 iRowid; /* Current rowid */
85678568
};

deps/sqlite-amalgamation-3500100/sqlite3.c renamed to deps/sqlite-amalgamation-3500200/sqlite3.c

Lines changed: 124 additions & 75 deletions
Large diffs are not rendered by default.

deps/sqlite-amalgamation-3500100/sqlite3.h renamed to deps/sqlite-amalgamation-3500200/sqlite3.h

Lines changed: 47 additions & 45 deletions
Large diffs are not rendered by default.
File renamed without changes.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@appthreat/sqlite3",
33
"description": "Asynchronous, non-blocking SQLite3 bindings. Forked from TryGhost/node-sqlite3",
4-
"version": "6.0.6",
4+
"version": "6.0.7",
55
"homepage": "https://github.com/AppThreat/node-sqlite3",
66
"author": "Team AppThreat <[email protected]>",
77
"binary": {
@@ -39,7 +39,7 @@
3939
},
4040
"dependencies": {
4141
"bindings": "^1.5.0",
42-
"node-addon-api": "^8.3.1",
42+
"node-addon-api": "^8.4.0",
4343
"prebuild-install": "^7.1.3"
4444
},
4545
"devDependencies": {

0 commit comments

Comments
 (0)